From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751643AbeAYXSX (ORCPT ); Thu, 25 Jan 2018 18:18:23 -0500 Received: from bedivere.hansenpartnership.com ([66.63.167.143]:46670 "EHLO bedivere.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751431AbeAYXSW (ORCPT ); Thu, 25 Jan 2018 18:18:22 -0500 Message-ID: <1516922299.3044.55.camel@HansenPartnership.com> Subject: Re: linux-next: manual merge of the scsi-mkp tree with the scsi tree From: James Bottomley To: Stephen Rothwell , "Martin K. Petersen" Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Darren Trapp , Himanshu Madhani Date: Thu, 25 Jan 2018 15:18:19 -0800 In-Reply-To: <20180126093914.4afaed4c@canb.auug.org.au> References: <20180126093914.4afaed4c@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.5 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2018-01-26 at 09:39 +1100, Stephen Rothwell wrote: > Hi Martin, > > Today's linux-next merge of the scsi-mkp tree got a conflict in: > >   drivers/scsi/qla2xxx/qla_init.c > > between commit: > >   07a21872cf2b ("scsi: qla2xxx: Fix queue ID for async abort with > Multiqueue") > > from the scsi tree and commit: > >   b027a5ace443 ("scsi: qla2xxx: Fix queue ID for async abort with > Multiqueue") > > from the scsi-mkp tree. > > Looks like you have updated your tree after James has merged it :-( OK, I pulled my tree into sync now.  I also added the postmerge tree, which I can rebase if it causes you similar problems (it's based on the block tree). James