Messages in this thread | | | Date | Thu, 16 Aug 2018 09:58:08 +1000 | From | Stephen Rothwell <> | Subject | 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 <sfr@canb.auug.org.au> wrote: > > On Fri, 3 Aug 2018 17:30:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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: > > > > 45332b1bdfdc ("gcc-plugins: split out Kconfig entries to scripts/gcc-plugins/Kconfig") > > > > from the kspp tree. > > > > I fixed it up (see below) 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. > > > > -- > > Cheers, > > Stephen Rothwell > > > > diff --cc arch/Kconfig > > index 6cf1b17a8df2,43f315b84c8f..000000000000 > > --- a/arch/Kconfig > > +++ b/arch/Kconfig > > @@@ -984,4 -836,4 +847,6 @@@ config REFCOUNT_FUL > > > > source "kernel/gcov/Kconfig" > > > > + source "scripts/gcc-plugins/Kconfig" > > ++ > > +endmenu > > This is now a conflict between Linus' tree and the kspp tree.
Ignore this, the kspp tree has been merged by Linus as well.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |