Hi all, On Wed, 22 May 2019 10:08:34 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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:
pgptgmFCH1lby.pgp
Description: OpenPGP digital signature