linux-next: manual merge of the scsi tree with the tip tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the scsi tree with the tip tree
Date	2017-01-20 04:30 +0100
Message-ID	<t1y3L-1Vd-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi James,

Today's linux-next merge of the scsi tree got a conflict in:

  drivers/scsi/mpt3sas/mpt3sas_scsih.c

between commit:

  e963b7088dac ("scsi: mpt3sas: Fix hang on ata passthru commands")

from the tip tree and commit:

  ffb584565894 ("scsi: mpt3sas: fix hang on ata passthrough commands")

from the scsi tree.

I fixed it up (slightly different versions of the same patch - I used
the latter version) 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the scsi tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-20 04:30 +0100
  Re: linux-next: manual merge of the scsi tree with the tip tree Ingo Molnar <mingo@kernel.org> - 2017-01-20 07:50 +0100
    Re: linux-next: manual merge of the scsi tree with the tip tree James Bottomley <James.Bottomley@HansenPartnership.com> - 2017-01-20 14:00 +0100
    Re: linux-next: manual merge of the scsi tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-20 14:30 +0100

csiph-web