From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751942AbdF3FLL (ORCPT <rfc822;w@1wt.eu>);
        Fri, 30 Jun 2017 01:11:11 -0400
Received: from ozlabs.org ([103.22.144.67]:56837 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751333AbdF3FLJ (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 30 Jun 2017 01:11:09 -0400
Date: Fri, 30 Jun 2017 15:11:07 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Nicholas A. Bellinger" <nab@linux-iscsi.org>,
        James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Quinn Tran <quinn.tran@cavium.com>
Subject: Re: linux-next: manual merge of the target-updates tree with the
 scsi-mkp tree
Message-ID: <20170630151107.60753385@canb.auug.org.au>
In-Reply-To: <20170613164742.7308e4dd@canb.auug.org.au>
References: <20170613164742.7308e4dd@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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi all,

With the merge window approaching, this is just a reminder that the
following conflict still exists.  No action is necessarily needed
except to maybe mention this to Linus at the appropriate time.

James, you have been added since you merged the scsi-mkp tree int the
scsi tree.

On Tue, 13 Jun 2017 16:47:42 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Nicholas,
> 
> Today's linux-next merge of the target-updates tree got a conflict in:
> 
>   drivers/scsi/qla2xxx/qla_target.c
> 
> between commit:
> 
>   f775bd14e44d ("scsi: qla2xxx: Convert 32-bit LUN usage to 64-bit")
> 
> from the scsi-mkp tree and commit:
> 
>   6b26726af699 ("qla2xxx: Convert QLA_TGT_ABTS to TARGET_SCF_LOOKUP_LUN_FROM_TAG")
> 
> from the target-updates tree.
> 
> I fixed it up (I basically used the latter verion of
> __qlt_24xx_handle_abts()) 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