Hi all,
Today's linux-next merge of the modules tree got a conflict in:
arch/alpha/kernel/module.c
between commit:
b6b17a8b3ecd ("alpha: fix R_ALPHA_LITERAL reloc for large modules")
from the origin tree and commit:
a76b092b5655 ("module: replace module_layout with module_memory")
from the modules tree.
I fixed it up (the former removed the code modificed by the latter) 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:
pgpXtNXwQIkOJ.pgp
Description: OpenPGP digital signature
