* linux-next: manual merge of the kbuild tree with the kbuild-current tree
@ 2018-11-12 22:30 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2018-11-12 22:30 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Changbin Du
[-- Attachment #1: Type: text/plain, Size: 801 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2018-11-12 22:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-12 22:30 linux-next: manual merge of the kbuild tree with the kbuild-current tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).