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 X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8C71C2D0A8 for ; Mon, 28 Sep 2020 10:42:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AD8F42080A for ; Mon, 28 Sep 2020 10:42:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726732AbgI1Km3 (ORCPT ); Mon, 28 Sep 2020 06:42:29 -0400 Received: from lhrrgout.huawei.com ([185.176.76.210]:2926 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726610AbgI1Km3 (ORCPT ); Mon, 28 Sep 2020 06:42:29 -0400 Received: from lhreml710-chm.china.huawei.com (unknown [172.18.7.107]) by Forcepoint Email with ESMTP id 9A98AFEF8C0DC0021CE8; Mon, 28 Sep 2020 11:42:27 +0100 (IST) Received: from localhost (10.52.126.2) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1913.5; Mon, 28 Sep 2020 11:42:27 +0100 Date: Mon, 28 Sep 2020 11:40:46 +0100 From: Jonathan Cameron To: Stephen Rothwell CC: Andrew Morton , "Rafael J. Wysocki" , Dan Williams , "Linux Next Mailing List" , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the akpm-current tree with the pm tree Message-ID: <20200928114046.000005ae@Huawei.com> In-Reply-To: <20200928202459.419ce848@canb.auug.org.au> References: <20200928202459.419ce848@canb.auug.org.au> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; i686-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.52.126.2] X-ClientProxiedBy: lhreml707-chm.china.huawei.com (10.201.108.56) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, 28 Sep 2020 20:24:59 +1000 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > drivers/acpi/numa/hmat.c > > between commits: > > 01feba590cd6 ("ACPI: Do not create new NUMA domains from ACPI static tables that are not SRAT") > 4eb3723f18e9 ("ACPI: Rename acpi_map_pxm_to_online_node() to pxm_to_online_node()") > > from the pm tree and commit: > > b499f2c84cbf ("ACPI: HMAT: refactor hmat_register_target_device to hmem_register_device") > > from the akpm-current tree. > > I fixed it up (see below) 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. > Looks like the correct conflict fix to me. Thanks Jonathan