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

2019-02-07 Thread Gustavo A. R. Silva
On 2/7/19 12:15 AM, Stephen Rothwell wrote: > Hi all, > > On Thu, 7 Feb 2019 16:51:34 +1100 Stephen Rothwell > wrote: >> >> On Thu, 7 Feb 2019 15:47:47 +1100 Stephen Rothwell >> wrote: >>> >>> Today's linux-next merge of the scsi-mkp tree got a conflict in: >>> >>> drivers/scsi/osd/osd_in

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

2019-02-06 Thread Stephen Rothwell
Hi all, On Thu, 7 Feb 2019 16:51:34 +1100 Stephen Rothwell wrote: > > On Thu, 7 Feb 2019 15:47:47 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the scsi-mkp tree got a conflict in: > > > > drivers/scsi/osd/osd_initiator.c > > > > between commit: > > > > 24648908aca

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

2019-02-06 Thread Stephen Rothwell
Hi all, On Thu, 7 Feb 2019 15:47:47 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the scsi-mkp tree got a conflict in: > > drivers/scsi/osd/osd_initiator.c > > between commit: > > 24648908acac ("scsi: osd: osd_initiator: mark expected switch > fall-throughs") I will remo