From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
Mark Brown <broonie@kernel•org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Hammer Hsieh <hammerh0314@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Srinivas Kandagatla <srinivas.kandagatla@linaro•org>,
Vincent Shih <vincent.sunplus@gmail•com>,
Li-hao Kuo <lhjeff911@gmail•com>
Subject: linux-next: manual merge of the char-misc tree with the spi and tty trees
Date: Mon, 28 Feb 2022 19:36:30 +1100 [thread overview]
Message-ID: <20220228193630.2e079d89@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1971 bytes --]
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
MAINTAINERS
between commits:
f62ca4e2a863 ("spi: Add spi driver for Sunplus SP7021")
b48b9f6deacf ("dt-bindings: serial: Add bindings doc for Sunplus SoC UART Driver")
9e8d5470325f ("serial: sunplus-uart: Add Sunplus SoC UART Driver")
from the spi and tty trees and commits:
9e8d5470325f ("serial: sunplus-uart: Add Sunplus SoC UART Driver")
8fb29b450182 ("dt-bindings: nvmem: Add bindings doc for Sunplus OCOTP driver")
from the char-misc 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 MAINTAINERS
index d1e56ec04e14,37ea1436fc62..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -18642,19 -18578,12 +18678,25 @@@ S: Maintaine
F: Documentation/devicetree/bindings/rtc/sunplus,sp7021-rtc.yaml
F: drivers/rtc/rtc-sunplus.c
+ SUNPLUS OCOTP DRIVER
+ M: Vincent Shih <vincent.sunplus@gmail•com>
+ S: Maintained
+ F: Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml
+ F: drivers/nvmem/sunplus-ocotp.c
+
+SUNPLUS SPI CONTROLLER INTERFACE DRIVER
+M: Li-hao Kuo <lhjeff911@gmail•com>
+L: linux-spi@vger•kernel.org
+S: Maintained
+F: Documentation/devicetree/bindings/spi/spi-sunplus-sp7021.yaml
+F: drivers/spi/spi-sunplus-sp7021.c
+
+SUNPLUS UART DRIVER
+M: Hammer Hsieh <hammerh0314@gmail•com>
+S: Maintained
+F: Documentation/devicetree/bindings/serial/sunplus,sp7021-uart.yaml
+F: drivers/tty/serial/sunplus-uart.c
+
SUPERH
M: Yoshinori Sato <ysato@users•sourceforge.jp>
M: Rich Felker <dalias@libc•org>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-02-28 8:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-28 8:36 Stephen Rothwell [this message]
2022-02-28 10:51 ` linux-next: manual merge of the char-misc tree with the spi and tty trees Greg KH
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=20220228193630.2e079d89@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=broonie@kernel$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hammerh0314@gmail$(echo .)com \
--cc=lhjeff911@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=srinivas.kandagatla@linaro$(echo .)org \
--cc=vincent.sunplus@gmail$(echo .)com \
/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