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

Hi all, On Thu, 16 Aug 2018 09:56:28 +1000 Stephen Rothwell wrote: > > On Fri, 3 Aug 2018 17:30:20 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the kspp tree got a conflict in: > > > > arch/Kconfig > > > > between commit: > > > > 22471e1313f2 ("kconfig: use a menu

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

Hi all, On Fri, 3 Aug 2018 17:30:20 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the kspp tree got a conflict in: > > arch/Kconfig > > between commit: > > 22471e1313f2 ("kconfig: use a menu in arch/Kconfig to reduce clutter") > > from the kbuild tree and commit: > > 4

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

Hi Kees, Today's linux-next merge of the kspp tree got a conflict in: arch/Kconfig between commit: 22471e1313f2 ("kconfig: use a menu in arch/Kconfig to reduce clutter") from the kbuild tree and commit: 45332b1bdfdc ("gcc-plugins: split out Kconfig entries to scripts/gcc-plugins/Kconfi