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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 764 bytes --]

Hi all,

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

from the fixes tree and commit:

  19fcae3d4f2d ("scsi: remove the SCSI OSD library")

from the scsi-mkp tree.

I fixed it up (the latter removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 405 bytes --]

Hi all,

On Thu, 7 Feb 2019 15:47:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 remove that from my fixes tree for tomorrow.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

Hi all,

On Thu, 7 Feb 2019 16:51:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 7 Feb 2019 15:47:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 remove that from my fixes tree for tomorrow.

And that same patch appears in the kspp-gustavo tree as well ...

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[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 <sfr@canb.auug.org.au> wrote:
>>
>> On Thu, 7 Feb 2019 15:47:47 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 remove that from my fixes tree for tomorrow.
> 
> And that same patch appears in the kspp-gustavo tree as well ...
> 

I will remove it from my tree.

Thanks, Stephen.

--
Gustavo