Subject: Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 12 Jul 2018 14:29:22 +1000

Hi all,

On Wed, 11 Jul 2018 14:04:57 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   54e45716a84a ("scsi: remove NCR_D700 driver")
> 
> from Linus' tree and commit:
> 
>   01a21986f8ed ("MAINTAINERS: Add Sam as the maintainer for NCSI")
> 
> from the scsi-mkp 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 e5f8823b5f02,f3de5d37179a..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -9810,17 -9750,6 +9810,11 @@@ F:	drivers/scsi/mac_scsi.
>   F:	drivers/scsi/sun3_scsi.*
>   F:	drivers/scsi/sun3_scsi_vme.c
>   
> - NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
> - M:	"James E.J. Bottomley" <[email-masked]>
> - L:	[email-masked]
> - S:	Maintained
> - F:	drivers/scsi/NCR_D700.*
> - 
>  +NCSI LIBRARY:
>  +M:	Samuel Mendoza-Jonas <[email-masked]>
>  +S:	Maintained
>  +F:	net/ncsi/
>  +
>   NCT6775 HARDWARE MONITOR DRIVER
>   M:	Guenter Roeck <[email-masked]>
>   L:	[email-masked]

This conflict is now between the scsi tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell