Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 21 Jun 2019 09:59:07 +1000
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>,
        Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the scsi tree with Linus' tree
Message-ID: <20190621095907.4a6a50fa@canb.auug.org.au>
In-Reply-To: <20190528114320.30637398@canb.auug.org.au>
References: <20190522100808.66994f6b@canb.auug.org.au>
        <20190528114320.30637398@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/ruxyLRDQ16ai9vFSC7QYoe6"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/ruxyLRDQ16ai9vFSC7QYoe6
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Tue, 28 May 2019 11:43:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> 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:
> >=20
> >   drivers/scsi/hosts.c

	...

> > between commits:
> >=20
> >   457c89965399 ("treewide: Add SPDX license identifier for missed files=
")
> >   09c434b8a004 ("treewide: Add SPDX license identifier for more missed =
files")
> >=20
> > from Linus' tree and commits:
> >=20
> >   026104bfa591 ("scsi: core: add SPDX tags to scsi midlayer files missi=
ng 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") =20
>=20
> I have now got more of these conflicts in
>=20
> drivers/scsi/libsas/sas_init.c

	...

OK, so here is the complete list (so far) of files in the scsi tree
that conflict with the SPDX updates in Linus' tree:

drivers/scsi/fcoe/fcoe.c
drivers/scsi/fcoe/fcoe.h
drivers/scsi/fcoe/fcoe_ctlr.c
drivers/scsi/fcoe/fcoe_sysfs.c
drivers/scsi/fcoe/fcoe_transport.c
drivers/scsi/hosts.c
drivers/scsi/libfc/fc_disc.c
drivers/scsi/libfc/fc_elsct.c
drivers/scsi/libfc/fc_exch.c
drivers/scsi/libfc/fc_fcp.c
drivers/scsi/libfc/fc_frame.c
drivers/scsi/libfc/fc_libfc.c
drivers/scsi/libfc/fc_libfc.h
drivers/scsi/libfc/fc_lport.c
drivers/scsi/libfc/fc_npiv.c
drivers/scsi/libfc/fc_rport.c
drivers/scsi/libiscsi.c
drivers/scsi/libiscsi_tcp.c
drivers/scsi/libsas/sas_ata.c
drivers/scsi/libsas/sas_host_smp.c
drivers/scsi/libsas/sas_init.c
drivers/scsi/libsas/sas_internal.h
drivers/scsi/libsas/sas_scsi_host.c
drivers/scsi/libsas/sas_task.c
drivers/scsi/osst.c
drivers/scsi/scsi.c
drivers/scsi/scsi_error.c
drivers/scsi/scsi_ioctl.c
drivers/scsi/scsi_lib.c
drivers/scsi/scsi_logging.c
drivers/scsi/scsi_pm.c
drivers/scsi/scsi_sysctl.c
drivers/scsi/scsi_sysfs.c
drivers/scsi/scsi_trace.c
drivers/scsi/scsi_transport_fc.c
drivers/scsi/scsi_transport_iscsi.c
drivers/scsi/scsi_transport_sas.c
drivers/scsi/scsi_transport_spi.c
drivers/scsi/sd.c
drivers/scsi/sd_dif.c
drivers/scsi/sd_zbc.c
drivers/scsi/ses.c
drivers/scsi/sg.c
drivers/scsi/sr.c
drivers/scsi/st.c
include/scsi/fc/fc_encaps.h
include/scsi/fc/fc_fc2.h
include/scsi/fc/fc_fcoe.h
include/scsi/fc/fc_fcp.h
include/scsi/fc/fc_ms.h
include/scsi/iscsi_if.h
include/scsi/iscsi_proto.h
include/scsi/libfc.h
include/scsi/libfcoe.h
include/scsi/libiscsi.h
include/scsi/libiscsi_tcp.h
include/scsi/libsas.h
include/scsi/sas.h
include/scsi/sas_ata.h
include/scsi/scsi_bsg_iscsi.h
include/scsi/scsi_transport.h
include/scsi/scsi_transport_fc.h
include/scsi/scsi_transport_iscsi.h
include/scsi/scsi_transport_spi.h

At what point does it become worth while to do a back merge of v5.2-rc4
(I think the last of the SPDX changes went into there) to take care of
all these (rather than Linus having to edit each of these files himself
during the merge window)?

--=20
Cheers,
Stephen Rothwell

--Sig_/ruxyLRDQ16ai9vFSC7QYoe6
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0MHcsACgkQAVBC80lX
0Gz0Kwf/UtAP44k2jBLhnFZ3zojgA8TIB2uIlzOGUfABRubQgdAGEA0XZqsyh+83
lNuq22D7sfeCwt6/FHOtXWq8xIAqSguKcGm4DkxkHq6E9RvIfPWSViNLrEw1hUZn
hos4RB62OQWTupkttpBmaoUtfo2flKSw799uVGqFpjJd/sYKR7DsGkOhYodCfa5R
5G9by5AUSfmuVZ6Xoo3nbHDAGmFPwRQdNMQdF1z9/PyAdKwJ/qRVKptBvWng/RZi
YQOvoVjcfhMADt1enNZxwhEEUKFHzVd6fLQERDvRK6lZZCKdSrYbsEezP79bIUhV
OclE+2Fo/uPyVec7c+Db5zpipjCYJg==
=lySb
-----END PGP SIGNATURE-----

--Sig_/ruxyLRDQ16ai9vFSC7QYoe6--