Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/ext4/file.c
between commit:
545052e9e35a ("ext4: Switch to iomap for SEEK_HOLE / SEEK_DATA")
from the ext4 tree and commit:
f7d4010a3383 ("mm, pagevec: remove cold parameter for pagevecs")
from the akpm-current tree.
I fixed it up (the former removed the reference to pagevec_init that
was updated in 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
