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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 21 Jun 2019 09:59:07 +1000

Hi all,

On Tue, 28 May 2019 11:43:20 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> On Wed, 22 May 2019 10:08:34 +1000 Stephen Rothwell <[email-masked]> wrote:
> >
> > Today's linux-next merge of the scsi tree got conflicts in:
> > 
> >   drivers/scsi/hosts.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

	...

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)?

-- 
Cheers,
Stephen Rothwell