* linux-next: manual merge of the akpm tree with the imx-mxs tree
@ 2017-05-16 1:00 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2017-05-16 1:00 UTC (permalink / raw)
To: Andrew Morton, Shawn Guo
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Arnd Bergmann, Randy Dunlap
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
drivers/soc/imx/Kconfig
between commit:
e23c7f7d5783 ("soc: imx: add PM dependency for IMX7_PM_DOMAINS")
from the imx-mxs tree and patch:
"imx7: fix Kconfig warning and build errors"
from the akpm tree.
I fixed it up (these both do the same thing, I just used the former) 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-05-16 1:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-16 1:00 linux-next: manual merge of the akpm tree with the imx-mxs 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).