From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751524AbeAYWjY (ORCPT ); Thu, 25 Jan 2018 17:39:24 -0500 Received: from ozlabs.org ([103.22.144.67]:59377 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751219AbeAYWjW (ORCPT ); Thu, 25 Jan 2018 17:39:22 -0500 Date: Fri, 26 Jan 2018 09:39:14 +1100 From: Stephen Rothwell To: "Martin K. Petersen" , James Bottomley Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Darren Trapp , Himanshu Madhani Subject: linux-next: manual merge of the scsi-mkp tree with the scsi tree Message-ID: <20180126093914.4afaed4c@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 :-( I fixed it up (I just 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