linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yury Norov <yury.norov@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	"Paul E. McKenney" <paulmck@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the rcu tree
Date: Wed, 12 May 2021 07:04:08 -0700	[thread overview]
Message-ID: <YJvgWHRNbLAKd7DW@yury-ThinkPad> (raw)
In-Reply-To: <20210512150448.05728739@canb.auug.org.au>

On Wed, May 12, 2021 at 03:04:48PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   Documentation/admin-guide/kernel-parameters.rst
> 
> between commit:
> 
>   b18def121f07 ("bitmap_parse: Support 'all' semantics")
> 
> from the rcu tree and commit:
> 
>   458a0b70b496 ("bitmap_parse: support 'all' semantics")
> 
> from the akpm-current tree.
> 
> I fixed it up (I just use the latter version) 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.

The difference is that Paul's version replaced 'isolcpus=all' with
'rcu_nocb=all' in documentation, which is more correct in general.

Could you please stick with the Paul's version, and sorry for
confusion?

Thanks,
Yury

  reply	other threads:[~2021-05-12 14:04 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-12  5:04 linux-next: manual merge of the akpm-current tree with the rcu tree Stephen Rothwell
2021-05-12 14:04 ` Yury Norov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-05-19 16:12 Stephen Rothwell
2014-09-08  8:53 Stephen Rothwell
2014-02-10  4:00 Stephen Rothwell
2014-02-10  5:24 ` Paul E. McKenney

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=YJvgWHRNbLAKd7DW@yury-ThinkPad \
    --to=yury.norov@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=paulmck@kernel.org \
    --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).