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

Hi all, On Wed, 2 Sep 2020 15:12:35 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the scsi-mkp tree got a conflict in: > > drivers/scsi/aacraid/aachba.c > > between commit: > > df561f6688fe ("treewide: Use fallthrough pseudo-keyword") > > from Linus' tree and commit: >

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

Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/ufs/ufshcd.c between commit: b10178ee7fa8 ("scsi: ufs: Clean up completed request without interrupt notification") from Linus' tree and commit: 307348f6ab14 ("scsi: ufs: Abort tasks before clearing

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

Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/aacraid/aachba.c between commit: df561f6688fe ("treewide: Use fallthrough pseudo-keyword") from Linus' tree and commit: cfd3d2225aa5 ("scsi: aacraid: Remove erroneous fallthrough annotation") from

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

Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/ufs/ufshcd.h between commit: 8da76f71fef7 ("scsi: ufs-pci: Add quirk for broken auto-hibernate for Intel EHL") from Linus' tree and commit: 5df6f2def50c ("scsi: ufs: Introduce skipping manual flush

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

Hi all, On Wed, 10 Jun 2020 12:17:07 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the scsi-mkp tree got a conflict in: > > drivers/scsi/sr.c > > between commit: > > a711d91cd97e ("block: add a cdrom_device_info pointer to struct gendisk") > > from Linus' tree and

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

Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/sr.c between commit: a711d91cd97e ("block: add a cdrom_device_info pointer to struct gendisk") from Linus' tree and commit: 6555781b3fde ("scsi: sr: Fix sr_probe() missing deallocate of device minor")

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

On 11/02/2019 04:31, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/hisi_sas/hisi_sas_v3_hw.c between commit: 7bb25a89aad2 ("scsi: hisi_sas: Set protection parameters prior to adding SCSI host") from Linus' tree and commit:

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

Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/hisi_sas/hisi_sas_v3_hw.c between commit: 7bb25a89aad2 ("scsi: hisi_sas: Set protection parameters prior to adding SCSI host") from Linus' tree and commit: b3cce125cb1e ("scsi: hisi_sas: Add support

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

On 2/6/2019 8:44 PM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/lpfc/lpfc_nvme.c between commit: 7961cba6f7d8 ("scsi: lpfc: nvme: avoid hang / use-after-free when destroying localport") from Linus' tree and commit:

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

Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/lpfc/lpfc_nvme.c between commit: 7961cba6f7d8 ("scsi: lpfc: nvme: avoid hang / use-after-free when destroying localport") from Linus' tree and commit: 4c47efc140fa ("scsi: lpfc: Move SCSI and NVME

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

Hi all, On Mon, 10 Dec 2018 17:17:16 +1100 Stephen Rothwell wrote: > > I fixed it up (see below) and can carry the fix as necessary. This See below :-) Also I accidentally left the declaration of "status" in __qla2x00_abort_all_cmds(). -- Cheers, Stephen Rothwell diff --cc

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

Hi Martin, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/qla2xxx/qla_os.c between commit: f2ffd4e5bc7b ("scsi: qla2xxx: Timeouts occur on surprise removal of QLogic adapter") from Linus' tree and commit: c4e521b654e1 ("scsi: qla2xxx: Split the

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

Hi Martin, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/lpfc/lpfc_debugfs.c between commit: 9e210178267b ("scsi: lpfc: Synchronize access to remoteport via rport") from Linus' tree and commit: d021613ee3ac ("scsi: lpfc: Remove set but not used variables

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

Hi Martin, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/lpfc/lpfc_debugfs.c between commit: 9e210178267b ("scsi: lpfc: Synchronize access to remoteport via rport") from Linus' tree and commit: d021613ee3ac ("scsi: lpfc: Remove set but not used variables

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

Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/qla2xxx/qla_init.c between commit: 36eb8ff672fa ("scsi: qla2xxx: Fix NULL pointer dereference for fcport search") from Linus' tree and commit: 48acad099074 ("scsi: qla2xxx: Fix N2N link re-connect")

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

Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/qla2xxx/qla_init.c between commit: 36eb8ff672fa ("scsi: qla2xxx: Fix NULL pointer dereference for fcport search") from Linus' tree and commit: 48acad099074 ("scsi: qla2xxx: Fix N2N link re-connect")

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

Hi all, Today's linux-next merge of the scsi-mkp tree got conflicts in: drivers/scsi/qla2xxx/qla_gs.c between commit: b5f3bc39a0e8 ("scsi: qla2xxx: Fix inconsistent DMA mem alloc/free") from Linus' tree and commit: 8777e4314d39 ("scsi: qla2xxx: Migrate NVME N2N handling into state

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

Hi all, Today's linux-next merge of the scsi-mkp tree got conflicts in: drivers/scsi/qla2xxx/qla_gs.c between commit: b5f3bc39a0e8 ("scsi: qla2xxx: Fix inconsistent DMA mem alloc/free") from Linus' tree and commit: 8777e4314d39 ("scsi: qla2xxx: Migrate NVME N2N handling into state

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

Hi all, On Wed, 11 Jul 2018 14:04:57 +1000 Stephen Rothwell 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

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

Hi all, On Wed, 11 Jul 2018 14:04:57 +1000 Stephen Rothwell 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

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

Hi all, 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

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

Hi all, 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

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

Hi Martin, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/qla2xxx/qla_os.c between commit: 2b5b96473efc ("scsi: qla2xxx: Fix FC-NVMe LUN discovery") from Linus' tree and commit: 33b28357dd00 ("scsi: qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan")

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

Hi Martin, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/qla2xxx/qla_os.c between commit: 2b5b96473efc ("scsi: qla2xxx: Fix FC-NVMe LUN discovery") from Linus' tree and commit: 33b28357dd00 ("scsi: qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan")

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

Hi Martin, On Thu, 30 Nov 2017 21:14:25 -0500 "Martin K. Petersen" wrote: > > > That should have been arcmsr_set_iop_datetime, sorry. I will fix it > > tomorrow if you haven't rebased onto v4.15-rc1 by then :-) > > I had such a huge pile of patches in the queue

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

Hi Martin, On Thu, 30 Nov 2017 21:14:25 -0500 "Martin K. Petersen" wrote: > > > That should have been arcmsr_set_iop_datetime, sorry. I will fix it > > tomorrow if you haven't rebased onto v4.15-rc1 by then :-) > > I had such a huge pile of patches in the queue that I was compelled to >

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

Stephen, > That should have been arcmsr_set_iop_datetime, sorry. I will fix it > tomorrow if you haven't rebased onto v4.15-rc1 by then :-) I had such a huge pile of patches in the queue that I was compelled to begin 4.16 early. I had meant to rebase that tree to rc1 before switching my

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

Stephen, > That should have been arcmsr_set_iop_datetime, sorry. I will fix it > tomorrow if you haven't rebased onto v4.15-rc1 by then :-) I had such a huge pile of patches in the queue that I was compelled to begin 4.16 early. I had meant to rebase that tree to rc1 before switching my

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

Hi Martin On Thu, 30 Nov 2017 12:51:21 +1100 Stephen Rothwell wrote: > > + static void arcmsr_init_set_datetime_timer(struct AdapterControlBlock *pacb) > + { > -init_timer(>refresh_timer); > ++timer_setup(>eternal_timer, arcmsr_request_device_map, 0);

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

Hi Martin On Thu, 30 Nov 2017 12:51:21 +1100 Stephen Rothwell wrote: > > + static void arcmsr_init_set_datetime_timer(struct AdapterControlBlock *pacb) > + { > -init_timer(>refresh_timer); > ++timer_setup(>eternal_timer, arcmsr_request_device_map, 0);

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

Hi Martin, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/arcmsr/arcmsr_hba.c between commits: b9eaf187 ("treewide: init_timer() -> setup_timer()") e99e88a9d2b0 ("treewide: setup_timer() -> timer_setup()") from Linus' tree and commits: ee09098d4769

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

Hi Martin, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/scsi/arcmsr/arcmsr_hba.c between commits: b9eaf187 ("treewide: init_timer() -> setup_timer()") e99e88a9d2b0 ("treewide: setup_timer() -> timer_setup()") from Linus' tree and commits: ee09098d4769

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

Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: include/scsi/scsi_cmnd.h between commit: 70e42fd02c46 ("scsi: sd_zbc: Write unlock zone from sd_uninit_cmnd()") from Linus' tree and commit: 64104f703212 ("scsi: Call scsi_initialize_rq() for filesystem requests")

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

Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: include/scsi/scsi_cmnd.h between commit: 70e42fd02c46 ("scsi: sd_zbc: Write unlock zone from sd_uninit_cmnd()") from Linus' tree and commit: 64104f703212 ("scsi: Call scsi_initialize_rq() for filesystem requests")