[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: 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:
> b3cce125cb1e ("scsi: hisi_sas: Add support for DIX feature for v3 hw")
> from the scsi-mkp tree.
> I fixed it up (I think - see below) 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.

The merge looks ok, thanks

JFYI, I did mention in the relevant patchset cover letter that the
series depends on commit 7bb25a89aad2 ("scsi: hisi_sas: Set protection
parameters prior to adding SCSI host"), which was not on Martin's 5.1
queue. The series seems to apply cleanly to that same branch without
this patch.


 \ /
  Last update: 2019-02-11 10:26    [W:0.029 / U:14.152 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site