Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
drivers/media/v4l2-core/videobuf2-dma-contig.c
between commit:
511a1b8a4c81 ("[media] Revert "[media] vb2: Push mmap_sem down to memops"")
from the v4l-dvb tree and patch:
"media: vb2: convert vb2_dc_get_userptr() to use frame vector"
from the akpm tree.
I fixed it up (I just used the akpm tree version) and can carry the fix
as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgppVkM5dQJGE.pgp
Description: OpenPGP digital signature
