linux-kernel - linux-next: manual merge of the char-misc tree with the spi and tty trees

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220228193630.2e079d89@canb.auug.org.au>
Date:   Mon, 28 Feb 2022 19:36:30 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>,
        Mark Brown <broonie@...nel.org>
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Hammer Hsieh <hammerh0314@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Srinivas Kandagatla <srinivas.kandagatla@...aro.org>,
        Vincent Shih <vincent.sunplus@...il.com>,
        Li-hao Kuo <lhjeff911@...il.com>
Subject: linux-next: manual merge of the char-misc tree with the spi and tty
 trees

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@...il.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@...il.com>
 +L:	linux-spi@...r.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@...il.com>
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/serial/sunplus,sp7021-uart.yaml
 +F:	drivers/tty/serial/sunplus-uart.c
 +
  SUPERH
  M:	Yoshinori Sato <ysato@...rs.sourceforge.jp>
  M:	Rich Felker <dalias@...c.org>

Content of type "application/pgp-signature" skipped