Messages in this thread | | | Date | Tue, 16 May 2017 11:00:09 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the imx-mxs tree |
| |
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
| |