linux-next: manual merge of the mm tree with the v4l-dvb-next tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the mm tree got a conflict in:

  drivers/staging/media/deprecated/stkwebcam/stk-webcam.c

between commit:

  aa68bf90a628 ("media: stkwebcam: remove deprecated driver")

from the v4l-dvb-next tree and commit:

  6fe0afd07701 ("mm: replace vma->vm_flags direct modifications with modifier calls")

from the mm 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.



-- 
Cheers,
Stephen Rothwell

Attachment: pgp2hjUKHndbr.pgp
Description: OpenPGP digital signature