Hi all,
Today's linux-next merge of the mm tree got a conflict in:
arch/m68k/include/asm/sun3_pgtable.h
between commit:
c2a6236024b7 ("m68k: sun3: Fix spelling mistake")
from the m68k tree and commit:
e7911fea382d ("m68k/mm: enable ARCH_HAS_VM_GET_PAGE_PROT")
from the mm tree.
I fixed it up (the latter removed the comment that the former updated)
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:
pgpVfVm2Ivhpt.pgp
Description: OpenPGP digital signature
