From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt.com>, Paul Walmsley <paul@pwsan.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Kefeng Wang <wangkefeng.wang@huawei.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Oscar Salvador <osalvador@suse.de>
Subject: Re: linux-next: manual merge of the akpm-current tree with the risc-v tree
Date: Thu, 6 May 2021 11:33:19 +1000 [thread overview]
Message-ID: <20210506113319.3fdf410f@canb.auug.org.au> (raw)
In-Reply-To: <20210312173702.18c4512a@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2398 bytes --]
Hi all,
On Fri, 12 Mar 2021 17:37:02 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Tomorrow's linux-next merge of the akpm-current tree will get a
> conflict in:
>
> Documentation/admin-guide/kernel-parameters.txt
>
> between commit:
>
> f6e5aedf470b ("riscv: Add support for memtest")
>
> from the risc-v tree and commit:
>
> 6b8f5ba8661b ("mm,memory_hotplug: add kernel boot option to enable memmap_on_memory")
>
> 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc Documentation/admin-guide/kernel-parameters.txt
> index b816481dfaef,04b4e76be65b..000000000000
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@@ -2800,23 -2802,7 +2808,23 @@@
> seconds. Use this parameter to check at some
> other rate. 0 disables periodic checking.
>
> + memory_hotplug.memmap_on_memory
> + [KNL,X86,ARM] Boolean flag to enable this feature.
> + Format: {on | off (default)}
> + When enabled, memory to build the pages tables for the
> + memmap array describing the hot-added range will be taken
> + from the range itself, so the memmap page tables will be
> + self-hosted.
> + Since only single memory device ranges are supported at
> + the moment, this option is disabled by default because
> + it might have an impact on workloads that needs large
> + contiguous memory chunks.
> + The state of the flag can be read in
> + /sys/module/memory_hotplug/parameters/memmap_on_memory.
> + Note that even when enabled, there are a few cases where
> + the feature is not effective.
> +
> - memtest= [KNL,X86,ARM,PPC] Enable memtest
> + memtest= [KNL,X86,ARM,PPC,RISCV] Enable memtest
> Format: <integer>
> default : 0 <disable>
> Specifies the number of memtest passes to be
This is now a conflict between the risc-v tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-05-06 1:33 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 6:37 linux-next: manual merge of the akpm-current tree with the risc-v tree Stephen Rothwell
2021-05-06 1:33 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-01 6:27 Stephen Rothwell
2020-12-14 9:21 Stephen Rothwell
2020-12-14 17:37 ` Andy Shevchenko
2020-12-15 0:55 ` Palmer Dabbelt
2020-12-17 1:25 ` Stephen Rothwell
2020-12-17 9:40 ` Andy Shevchenko
2020-12-17 10:05 ` Stephen Rothwell
2020-12-17 17:06 ` Palmer Dabbelt
2020-11-27 7:34 Stephen Rothwell
2020-12-17 1:26 ` Stephen Rothwell
2020-12-17 2:18 ` Kefeng Wang
2020-10-06 10:39 Stephen Rothwell
2020-10-07 4:32 ` Palmer Dabbelt
2020-10-07 4:48 ` Atish Patra
2020-10-07 21:58 ` Atish Patra
2020-07-10 7:44 Stephen Rothwell
2020-04-28 6:55 Stephen Rothwell
2019-09-02 11:48 Stephen Rothwell
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=20210506113319.3fdf410f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=osalvador@suse.de \
--cc=palmer@dabbelt.com \
--cc=paul@pwsan.com \
--cc=wangkefeng.wang@huawei.com \
/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).