Re: linux-next: manual merge of the rcu tree with the kbuild tree

2020-07-01 Thread Masahiro Yamada
On Wed, Jul 1, 2020 at 2:52 PM Marco Elver wrote: > > 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

Re: linux-next: manual merge of the rcu tree with the kbuild tree

2020-06-30 Thread Marco Elver
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 KC

linux-next: manual merge of the rcu tree with the kbuild tree

2020-06-30 Thread Stephen Rothwell
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") from the kbuild tree and commits: 2839a232071f ("kcsan: Simplify compiler flags") 61d56d7aa5ec ("kcsan: Disa