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()
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
drivers/media/v4l2-core/videobuf2-vmalloc.c
between commit:
511a1b8a4c81 ("[media] Revert "[media] vb2: Push mmap_sem down to memops"")
from the v4l-dvb tree and patch:
"media: vb2: Convert
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
drivers/media/v4l2-core/videobuf2-dma-sg.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_dma_sg_get_userptr()
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
drivers/media/v4l2-core/videobuf2-dma-sg.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_dma_sg_get_userptr() to
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
drivers/media/v4l2-core/videobuf2-vmalloc.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_vmalloc_get_userptr() to
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
6 matches
Mail list logo