Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <8cb0cc86-470d-8b58-d03d-e33a1a18280b@huawei.com>
Date:   Mon, 14 Feb 2022 08:57:53 +0000
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.5.1
Subject: Re: linux-next: manual merge of the scsi-mkp tree with Linus' tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        "Martin K. Petersen" <martin.petersen@oracle.com>
CC:     Ajish Koshy <Ajish.Koshy@microchip.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Viswas G <Viswas.G@microchip.com>
References: <20220214142936.41bd3e7d@canb.auug.org.au>
From:   John Garry <john.garry@huawei.com>
In-Reply-To: <20220214142936.41bd3e7d@canb.auug.org.au>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 14/02/2022 03:29, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the scsi-mkp tree got conflicts in:
> 
>    drivers/scsi/pm8001/pm8001_hwi.c
>    drivers/scsi/pm8001/pm80xx_hwi.c
> 
> between commit:
> 
>    c26b85ea1636 ("scsi: pm80xx: Fix double completion for SATA devices")
> 
> from Linus' tree and commit:
> 
>    26fc0ea74fcb ("scsi: libsas: Drop SAS_TASK_AT_INITIATOR")
> 
> from the scsi-mkp tree.
> 
> I fixed it up (the former removed the code modified by the latter) 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.
> 

Thanks for the heads up. So, yeah, your change looks right.

Cheers,
John