Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
arch/arm/include/debug/netx.S
between commit:
d2912cb15bdd ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500")
from Linus' tree and commit:
ceb02dcf676f ("ARM: delete netx machine")
from the arm-soc tree.
I fixed it up (I just removed the file) 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:
pgp7rZ32ZeBsb.pgp
Description: OpenPGP digital signature
