Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Masahiro Yamada <masahiroy@kernel.org>
To: Marco Elver <elver@google.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	"Paul E. McKenney" <paulmck@kernel.org>,
	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 rcu tree with the kbuild tree
Date: Wed, 1 Jul 2020 19:53:51 +0900
Message-ID: <CAK7LNAQ_X2Kmgqc3B1m7g1K8Xnvo+ja3A11eZXRFAOqDC4Jxcw@mail.gmail.com> (raw)
In-Reply-To: <CANpmjNMz0rtC7AnXUnZKfg+egqqQ3BKPznsWUdEqJQDLTgAaAQ@mail.gmail.com>

On Wed, Jul 1, 2020 at 2:52 PM Marco Elver <elver@google.com> wrote:
>
> On Wed, 1 Jul 2020 at 03:34, Stephen Rothwell <sfr@canb.auug.org.au> 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?


Done.

Thanks.


> 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
> this.
>
> Please see: https://lkml.kernel.org/r/20200624190236.GA6603@paulmck-ThinkPad-P72
>
> > 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!
>




-- 
Best Regards
Masahiro Yamada

      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
2020-07-01 10:53   ` Masahiro Yamada [this message]

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=CAK7LNAQ_X2Kmgqc3B1m7g1K8Xnvo+ja3A11eZXRFAOqDC4Jxcw@mail.gmail.com \
    --to=masahiroy@kernel.org \
    --cc=elver@google.com \
    --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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 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/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git