Linux-Next Archive on
 help / color / Atom feed
From: Marco Elver <>
To: Stephen Rothwell <>,
	Masahiro Yamada <>
Cc: "Paul E. McKenney" <>,
	Linux Next Mailing List <>,
	Linux Kernel Mailing List <>
Subject: Re: linux-next: manual merge of the rcu tree with the kbuild tree
Date: Wed, 1 Jul 2020 07:52:14 +0200
Message-ID: <> (raw)
In-Reply-To: <>

On Wed, 1 Jul 2020 at 03:34, Stephen Rothwell <> wrote:
> Hi all,
> Today's linux-next merge of the rcu tree got a conflict in:
>   kernel/kcsan/Makefile
> between commit:
>   f7c28e224da6 ("kbuild: remove cc-option test of -fno-stack-protector")

Is it possible that this patch drops the KCSAN portion? The patch
"kcsan: Simplify compiler flags" does the same, but is part of a
future pull request intended for 5.9.

The KCSAN changes had been in -next for well over a week. Also, I'm
sorry I hadn't seen your patch before, otherwise I would have noticed

Please see:

> from the kbuild tree and commits:
>   2839a232071f ("kcsan: Simplify compiler flags")
>   61d56d7aa5ec ("kcsan: Disable branch tracing in core runtime")
> from the rcu tree.
> I fixed it up (I just used the rcu tree 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.

Thank you!

-- Marco

  reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-01  1:34 Stephen Rothwell
2020-07-01  5:52 ` Marco Elver [this message]
2020-07-01 10:53   ` Masahiro Yamada

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on

Archives are clonable:
	git clone --mirror linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ \
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone