From: Stephen Rothwell <sfr@canb•auug.org.au>
To: James Bottomley <James.Bottomley@HansenPartnership•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Thomas Gleixner <tglx@linutronix•de>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Christoph Hellwig <hch@lst•de>,
"Martin K. Petersen" <martin.petersen@oracle•com>,
Hannes Reinecke <hare@suse•com>
Subject: Re: linux-next: manual merge of the scsi tree with Linus' tree
Date: Tue, 28 May 2019 11:43:20 +1000 [thread overview]
Message-ID: <20190528114320.30637398@canb.auug.org.au> (raw)
In-Reply-To: <20190522100808.66994f6b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1277 bytes --]
Hi all,
On Wed, 22 May 2019 10:08:34 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the scsi tree got conflicts in:
>
> drivers/scsi/hosts.c
> drivers/scsi/libsas/sas_task.c
> drivers/scsi/scsi.c
> drivers/scsi/scsi_error.c
> drivers/scsi/scsi_ioctl.c
> drivers/scsi/scsi_lib.c
> drivers/scsi/scsi_pm.c
> drivers/scsi/scsi_sysfs.c
> drivers/scsi/sd.c
> drivers/scsi/sr.c
> drivers/scsi/st.c
>
> between commits:
>
> 457c89965399 ("treewide: Add SPDX license identifier for missed files")
> 09c434b8a004 ("treewide: Add SPDX license identifier for more missed files")
>
> from Linus' tree and commits:
>
> 026104bfa591 ("scsi: core: add SPDX tags to scsi midlayer files missing licensing information")
> 5502239e73e6 ("scsi: libsas: add a SPDX tag to sas_task.c")
> 5897b844b7f9 ("scsi: sd: add a SPDX tag to sd.c")
> 95b04a2ff9c7 ("scsi: sr: add a SPDX tag to sr.c")
> 50a1ea5bebbc ("scsi: st: add a SPDX tag to st.c")
I have now got more of these conflicts in
drivers/scsi/libsas/sas_init.c
drivers/scsi/libsas/sas_internal.h
drivers/scsi/libsas/sas_scsi_host.c
drivers/scsi/sg.c
include/scsi/libsas.h
include/scsi/sas.h
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-05-28 1:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-22 0:08 linux-next: manual merge of the scsi tree with Linus' tree Stephen Rothwell
2019-05-28 1:43 ` Stephen Rothwell [this message]
2019-06-20 23:59 ` Stephen Rothwell
2019-06-21 0:07 ` Linus Torvalds
2019-06-21 0:34 ` Martin K. Petersen
2019-06-21 0:35 ` James Bottomley
2019-06-21 0:47 ` Linus Torvalds
2019-06-21 1:14 ` Martin K. Petersen
2019-06-21 6:21 ` Greg Kroah-Hartman
-- strict thread matches above, loose matches on Subject: below --
2019-05-22 0:11 Stephen Rothwell
2019-01-24 3:58 Stephen Rothwell
2019-01-14 2:48 Stephen Rothwell
2019-01-14 5:42 ` 黃清隆
2017-11-06 3:48 Stephen Rothwell
[not found] <20140124130547.323ce38edc8dedfd653534b7@canb.auug.org.au>
2014-01-24 2:22 ` James Bottomley
2012-07-20 0:32 Stephen Rothwell
2012-07-20 7:29 ` James Bottomley
2012-07-20 16:31 ` Linus Torvalds
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=20190528114320.30637398@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hare@suse$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
/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