linux-next: manual merge of the v4l-dvb tree with the dma-mapping tree
From: Stephen Rothwell
Date: Wed Feb 20 2019 - 18:58:58 EST
Today's linux-next merge of the v4l-dvb tree got a conflict in:
82c5de0ab8db ("dma-mapping: remove the DMA_MEMORY_EXCLUSIVE flag")
from the dma-mapping tree and commit:
43a445f188e1 ("media: sh_mobile_ceu_camera: remove obsolete soc_camera driver")
from the v4l-dvb tree.
I fixed it up (I just removed the file) 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.
Description: OpenPGP digital signature