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

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

[Stephen Rothwell]

[-- 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 --]

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

[Greg KH]

On Mon, Feb 28, 2022 at 07:36:30PM +1100, Stephen Rothwell wrote:
> 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>

Fix looks good, thanks.

greg k-h