From: Stephen Rothwell <sfr@canb.auug.org.au>
To: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Johannes Thumshirn <jthumshirn@suse.de>,
Joel Stanley <joel@jms.id.au>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree
Date: Thu, 12 Jul 2018 14:29:22 +1000 [thread overview]
Message-ID: <20180712142922.57ac7ca2@canb.auug.org.au> (raw)
In-Reply-To: <20180711140457.5c366429@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1632 bytes --]
Hi all,
On Wed, 11 Jul 2018 14:04:57 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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" <James.Bottomley@HansenPartnership.com>
> - L: linux-scsi@vger.kernel.org
> - S: Maintained
> - F: drivers/scsi/NCR_D700.*
> -
> +NCSI LIBRARY:
> +M: Samuel Mendoza-Jonas <sam@mendozajonas.com>
> +S: Maintained
> +F: net/ncsi/
> +
> NCT6775 HARDWARE MONITOR DRIVER
> M: Guenter Roeck <linux@roeck-us.net>
> L: linux-hwmon@vger.kernel.org
This conflict is now between the scsi tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-07-12 4:29 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-11 4:04 linux-next: manual merge of the scsi-mkp tree with Linus' tree Stephen Rothwell
2018-07-12 4:29 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-28 3:02 Stephen Rothwell
2023-09-01 0:23 ` Karan Tilak Kumar (kartilak)
2023-03-20 1:16 Stephen Rothwell
2022-02-14 3:29 Stephen Rothwell
2022-02-14 8:57 ` John Garry
2021-12-08 3:32 Stephen Rothwell
2021-10-06 4:44 Stephen Rothwell
2021-08-11 5:40 Stephen Rothwell
2021-08-11 5:53 ` Sreekanth Reddy
2021-08-12 3:25 ` Martin K. Petersen
2020-09-03 5:21 Stephen Rothwell
2020-09-02 5:15 Stephen Rothwell
2020-09-02 5:12 Stephen Rothwell
2020-09-11 4:47 ` Stephen Rothwell
2020-06-10 2:17 Stephen Rothwell
2020-06-11 2:12 ` Stephen Rothwell
2019-02-11 4:31 Stephen Rothwell
2019-02-11 9:24 ` John Garry
2019-02-07 4:44 Stephen Rothwell
2019-02-07 18:30 ` James Smart
2018-12-10 6:17 Stephen Rothwell
2018-12-10 7:09 ` Stephen Rothwell
2018-10-18 4:15 Stephen Rothwell
2018-08-03 6:22 Stephen Rothwell
2018-08-03 6:04 Stephen Rothwell
2018-03-22 5:54 Stephen Rothwell
2017-11-30 1:51 Stephen Rothwell
2017-11-30 1:55 ` Stephen Rothwell
2017-12-01 2:14 ` Martin K. Petersen
2017-12-01 3:42 ` Stephen Rothwell
2017-09-01 4:48 Stephen Rothwell
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=20180712142922.57ac7ca2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=James.Bottomley@HansenPartnership.com \
--cc=davem@davemloft.net \
--cc=joel@jms.id.au \
--cc=jthumshirn@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).