From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ingo Molnar Subject: Re: linux-next: manual merge of the scsi tree with the tip tree Date: Fri, 20 Jan 2017 07:35:52 +0100 Message-ID: <20170120063552.GA14142@gmail.com> References: <20170120142343.3d2e72af@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20170120142343.3d2e72af@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: James Bottomley , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Martin K. Petersen" List-Id: linux-next.vger.kernel.org * Stephen Rothwell wrote: > 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. I only had that patch for testing and it went into the -next branch by accident - I have removed it so the conflict should be gone next time -next is integrated. Thanks, Ingo