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:
>
>
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 commit:
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:
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:
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 drivers/scsi/qla2
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 ("MAINTAINERS
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
> begi
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 for-nex
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(&pacb->refresh_timer);
> ++timer_setup(&pacb->eternal_timer, arcmsr_request_device_map, 0);
9 matches
Mail list logo
