From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 614A6C433EF for ; Mon, 14 Feb 2022 08:57:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242557AbiBNI6E (ORCPT ); Mon, 14 Feb 2022 03:58:04 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:52840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242289AbiBNI6C (ORCPT ); Mon, 14 Feb 2022 03:58:02 -0500 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5631B5F8F9; Mon, 14 Feb 2022 00:57:55 -0800 (PST) Received: from fraeml734-chm.china.huawei.com (unknown [172.18.147.207]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4JxylL5bW2z67P1d; Mon, 14 Feb 2022 16:57:02 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml734-chm.china.huawei.com (10.206.15.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Mon, 14 Feb 2022 09:57:52 +0100 Received: from [10.47.81.62] (10.47.81.62) by lhreml724-chm.china.huawei.com (10.201.108.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.21; Mon, 14 Feb 2022 08:57:51 +0000 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 , "Martin K. Petersen" CC: Ajish Koshy , Linux Kernel Mailing List , Linux Next Mailing List , Viswas G References: <20220214142936.41bd3e7d@canb.auug.org.au> From: John Garry In-Reply-To: <20220214142936.41bd3e7d@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.47.81.62] X-ClientProxiedBy: lhreml703-chm.china.huawei.com (10.201.108.52) To lhreml724-chm.china.huawei.com (10.201.108.75) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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