Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 10 Dec 2020 17:40:47 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>, Kishon Vijay Abraham I <kishon@ti.com>,
        Vinod Koul <vkoul@kernel.org>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Sergio Paracuellos <sergio.paracuellos@gmail.com>
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

--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--