Messages in this thread | | | Date | Thu, 10 Dec 2020 17:40:47 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the phy-next tree |
| |
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/ [unhandled content-type:application/pgp-signature] | |