Hi all,
Today's linux-next merge of the ftrace tree got a conflict in:
init/main.c
between commit:
212f863fa881 ("bootconfig: do not put quotes on cmdline items unless necessary")
from the mm-nonmm-stable tree and commit:
efee03a50c28 ("bootconfig: do not put quotes on cmdline items unless necessary")
from the ftrace tree.
I fixed it up (I just used the former - since it has an extra comment)
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