Subject: linux-next: manual merge of the kbuild tree with the kbuild-current tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 13 Nov 2018 09:30:50 +1100

Hi all,

Today's linux-next merge of the kbuild tree got a conflict in:

  init/Kconfig

between commit:

  f9af851aa8e7 ("kernel hacking: support building kernel with -Og optimization level")

from the kbuild-current tree and commit:

  a4219aff51b8 ("kernel hacking: support building kernel with -Og optimization level")

from the kbuild tree.

I fixed it up (I used the kbuild-current 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.

-- 
Cheers,
Stephen Rothwell