* linux-next: manual merge of the staging tree with the phy-next tree
@ 2020-12-10 6:40 Stephen Rothwell
2020-12-10 6:50 ` Sergio Paracuellos
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-12-10 6:40 UTC (permalink / raw)
To: Greg KH, Kishon Vijay Abraham I, Vinod Koul
Cc: Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List, Sergio Paracuellos
[-- Attachment #1: Type: text/plain, Size: 1819 bytes --]
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 family")
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.
--
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
source "drivers/staging/mt7621-pci/Kconfig"
- source "drivers/staging/mt7621-pinctrl/Kconfig"
-source "drivers/staging/mt7621-pci-phy/Kconfig"
--
source "drivers/staging/mt7621-dma/Kconfig"
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) += greybus
obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/
obj-$(CONFIG_PI433) += pi433/
obj-$(CONFIG_PCI_MT7621) += mt7621-pci/
- obj-$(CONFIG_PINCTRL_RT2880) += mt7621-pinctrl/
-obj-$(CONFIG_PCI_MT7621_PHY) += mt7621-pci-phy/
obj-$(CONFIG_SOC_MT7621) += mt7621-dma/
obj-$(CONFIG_DMA_RALINK) += ralink-gdma/
obj-$(CONFIG_SOC_MT7621) += mt7621-dts/
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the staging tree with the phy-next tree
2020-12-10 6:40 linux-next: manual merge of the staging tree with the phy-next tree Stephen Rothwell
@ 2020-12-10 6:50 ` Sergio Paracuellos
0 siblings, 0 replies; 2+ messages in thread
From: Sergio Paracuellos @ 2020-12-10 6:50 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, Kishon Vijay Abraham I, Vinod Koul, Greg Kroah-Hartman,
Linux Kernel Mailing List, Linux Next Mailing List
Hi Stephen,
On Thu, Dec 10, 2020 at 7:40 AM Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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 family")
>
> 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.
Thanks for doing this. Removing both in staging is the correct thing to do.
>
> --
> Cheers,
> Stephen Rothwell
Best regards,
Sergio Paracuellos
>
> 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
>
> source "drivers/staging/mt7621-pci/Kconfig"
>
> - source "drivers/staging/mt7621-pinctrl/Kconfig"
> -source "drivers/staging/mt7621-pci-phy/Kconfig"
> --
> source "drivers/staging/mt7621-dma/Kconfig"
>
> 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) += greybus
> obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/
> obj-$(CONFIG_PI433) += pi433/
> obj-$(CONFIG_PCI_MT7621) += mt7621-pci/
> - obj-$(CONFIG_PINCTRL_RT2880) += mt7621-pinctrl/
> -obj-$(CONFIG_PCI_MT7621_PHY) += mt7621-pci-phy/
> obj-$(CONFIG_SOC_MT7621) += mt7621-dma/
> obj-$(CONFIG_DMA_RALINK) += ralink-gdma/
> obj-$(CONFIG_SOC_MT7621) += mt7621-dts/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-10 6:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-10 6:40 linux-next: manual merge of the staging tree with the phy-next tree Stephen Rothwell
2020-12-10 6:50 ` Sergio Paracuellos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox