From mboxrd@z Thu Jan 1 00:00:00 1970 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 B4964C433FE for ; Thu, 10 Dec 2020 06:41:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E89023B98 for ; Thu, 10 Dec 2020 06:41:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387587AbgLJGlg (ORCPT ); Thu, 10 Dec 2020 01:41:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728974AbgLJGlf (ORCPT ); Thu, 10 Dec 2020 01:41:35 -0500 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D55CEC0613CF; Wed, 9 Dec 2020 22:40:54 -0800 (PST) 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 4Cs47624CBz9sVl; Thu, 10 Dec 2020 17:40:50 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1607582451; bh=hugfZXiv11BFqaO/f2B1HjycHJ7IP7Z/TBLmKjhbeYM=; h=Date:From:To:Cc:Subject:From; b=LdTLlZpdf6GLsNzJ49CiL6b8WdISWML5DipaXsQUgd65FR3DWKCwo3qR+QqK+Qc17 +e7dt68RXRAIwCyu0z6QsrZB0lPu3rYzMN7wRrgoTBre5AkOZ0vWdHC6EKo0UhPd/V 8EVIeFNzK078gJ9IiiQGbl0O9ZuVbi8zd6tFIwnQDcAjBTyk9ICdhZCvO58rM0ZaLH avPExY1H0nRYiFrOSC5XqO6fIxscoQGDvSLbbAvEmbBGTy5099p1592/k1XwnkXviF Gj+WyBBCklgar1mSMlRICLHnze7PpIfXfhZaj80NlZWjMUmGKBKusxAbFTh38Prhl5 2pOLXWbgulMjg== Date: Thu, 10 Dec 2020 17:40:47 +1100 From: Stephen Rothwell To: Greg KH , Kishon Vijay Abraham I , Vinod Koul Cc: Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Sergio Paracuellos Subject: linux-next: manual merge of the staging tree with the phy-next tree Message-ID: <20201210174047.3d1f8aaa@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/O4SzRHQndoKBDnHe5_08FFL"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/O4SzRHQndoKBDnHe5_08FFL Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the staging tree got conflicts in: drivers/staging/Kconfig drivers/staging/Makefile between commit: 53e7c92c7fa0 ("staging: mt7621-pci-phy: remove driver from staging") from the phy-next tree and commit: 518b466a21ad ("pinctrl: ralink: add a pinctrl driver for the rt2880 famil= y") from the staging 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/staging/Kconfig index 4d7a5ddf9992,c42708e60afc..000000000000 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@@ -94,8 -92,8 +92,6 @@@ source "drivers/staging/pi433/Kconfig =20 source "drivers/staging/mt7621-pci/Kconfig" =20 - source "drivers/staging/mt7621-pinctrl/Kconfig" -source "drivers/staging/mt7621-pci-phy/Kconfig" -- source "drivers/staging/mt7621-dma/Kconfig" =20 source "drivers/staging/ralink-gdma/Kconfig" diff --cc drivers/staging/Makefile index 89bde2370eee,ebcc646d7b51..000000000000 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@@ -37,7 -36,7 +36,6 @@@ obj-$(CONFIG_GREYBUS) +=3D greybus obj-$(CONFIG_BCM2835_VCHIQ) +=3D vc04_services/ obj-$(CONFIG_PI433) +=3D pi433/ obj-$(CONFIG_PCI_MT7621) +=3D mt7621-pci/ - obj-$(CONFIG_PINCTRL_RT2880) +=3D mt7621-pinctrl/ -obj-$(CONFIG_PCI_MT7621_PHY) +=3D mt7621-pci-phy/ obj-$(CONFIG_SOC_MT7621) +=3D mt7621-dma/ obj-$(CONFIG_DMA_RALINK) +=3D ralink-gdma/ obj-$(CONFIG_SOC_MT7621) +=3D mt7621-dts/ --Sig_/O4SzRHQndoKBDnHe5_08FFL Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/RwvAACgkQAVBC80lX 0GyHRgf/aPmOW4WtbekZfjpWNFDf+l03fmojDldGcw2dNxzkqKcTcsD2ZNpLvcVL +6nz3mnpYNGZGXuglOMxDQNdqq7nzKuQbR4XZpKhVH5d9U0b9MWmwLwHEfVZbOub OFrRUFz/kVzPp2nuJvVkI0D6xwFdoeLzvljZ5e5J8KOIRD/YCzhbYOboE8B4EI0Q 11Kca3irZ16XsOd8wv8LS1huVHWfaGBR6tLssds2BzpsmAr+CFkb5mtbZL3ZWlJB w+YhEtXcdosc4WJ1UIxqTneymVWsFiPaDajQcXT2CbyeS1P4xlLuwOHuYCrM48aP IK3n77ijEbn1YV3Vf4lQ6fVlzbGN6A== =CGvU -----END PGP SIGNATURE----- --Sig_/O4SzRHQndoKBDnHe5_08FFL--