From patchwork Tue Apr 6 08:48:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12184533 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 935E2C43460 for ; Tue, 6 Apr 2021 08:48:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61967613C3 for ; Tue, 6 Apr 2021 08:48:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244548AbhDFIsb (ORCPT ); Tue, 6 Apr 2021 04:48:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232593AbhDFIs2 (ORCPT ); Tue, 6 Apr 2021 04:48:28 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A451C06174A; Tue, 6 Apr 2021 01:48:19 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4FF1Q71N5vz9sW1; Tue, 6 Apr 2021 18:48:15 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1617698897; bh=ABsHGZMGOlwHdAHhwJmAPXIrNxN9GB+9+e8gemhSckg=; h=Date:From:To:Cc:Subject:From; b=lG0v4aYszpO37QFTERoEeotcZl75jQRPSk7enz2n4IT6zxM1/DJyAGUD/sWiJ4HF+ nRQatVtm+yGyLdwakqgFTCysIvufVTTV9Sfl8dco0o4bt7HBIkD5WAoDsEBgAq2sFq AHoOq0LCH/sTy5nH3azlCEiGbWUuhOCi8iE+F+gq9FGvC5j0jaR6KPYdqeTsmB+Jft nxsWvB4rTjEa8lj6kQp8qP/eGjJ51tjjjFH8a0d6iIVEkuUXFgr9Bekl4iCS8ewYUG cJABoJU1YESx5+GGrpdKwMvAmd7mXhrLVWA4TzQDdHLov2AVZ8gBUlOpsP4+z+NEdp ioctRvXra6SAA== Date: Tue, 6 Apr 2021 18:48:14 +1000 From: Stephen Rothwell To: Greg KH , David Miller , Networking Cc: Greg Kroah-Hartman , Jiri Slaby , Jiri Slaby , Linux Kernel Mailing List , Linux Next Mailing List , Zheng Yongjun Subject: linux-next: manual merge of the tty tree with the net-next tree Message-ID: <20210406184814.3c958f51@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the tty tree got a conflict in: net/nfc/nci/uart.c between commit: d3295869c40c ("net: nfc: Fix spelling errors in net/nfc module") from the net-next tree and commit: c2a5a45c0276 ("net: nfc: nci: drop nci_uart_ops::recv_buf") from the tty tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc net/nfc/nci/uart.c index 6af5752cde09,9958b37d8f9d..000000000000 --- a/net/nfc/nci/uart.c