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
Date: Thu, 10 Dec 2020 17:40:47 +1100 [thread overview]
Message-ID: <20201210174047.3d1f8aaa@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2020-12-10 6:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 6:40 Stephen Rothwell [this message]
2020-12-10 6:50 ` linux-next: manual merge of the staging tree with the phy-next tree Sergio Paracuellos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201210174047.3d1f8aaa@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=kishon@ti$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sergio.paracuellos@gmail$(echo .)com \
--cc=vkoul@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox