From: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Dan Williams <dan.j.williams@intel.com>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the pm tree
Date: Mon, 28 Sep 2020 11:40:46 +0100 [thread overview]
Message-ID: <20200928114046.000005ae@Huawei.com> (raw)
In-Reply-To: <20200928202459.419ce848@canb.auug.org.au>
On Mon, 28 Sep 2020 20:24:59 +1000
Stephen Rothwell <sfr@canb.auug.org.au> 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
next prev parent reply other threads:[~2020-09-28 10:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 10:24 linux-next: manual merge of the akpm-current tree with the pm tree Stephen Rothwell
2020-09-28 10:40 ` Jonathan Cameron [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-10-01 9:53 Stephen Rothwell
2020-10-01 17:14 ` Nathan Chancellor
2014-10-23 3:09 Stephen Rothwell
2014-10-23 13:06 ` Michal Hocko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200928114046.000005ae@Huawei.com \
--to=jonathan.cameron@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).