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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1591 bytes --]

Hi all,

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

  drivers/media/common/videobuf2/frame_vector.c

between commit:

  e2fc6edd37ba ("media: videobuf2: revert "get_userptr: buffers are always writable"")

from the v4l-dvb-next tree and commit:

  cb78a634f3f7 ("mm/frame-vector: remove FOLL_FORCE usage")

from the mm-stable tree.

I fixed it up (see below) 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

diff --cc drivers/media/common/videobuf2/frame_vector.c
index 0a8a9dd34782,062e98148c53..000000000000
--- a/drivers/media/common/videobuf2/frame_vector.c
+++ b/drivers/media/common/videobuf2/frame_vector.c
@@@ -33,11 -32,14 +33,11 @@@
   *
   * This function takes care of grabbing mmap_lock as necessary.
   */
 -int get_vaddr_frames(unsigned long start, unsigned int nr_frames,
 +int get_vaddr_frames(unsigned long start, unsigned int nr_frames, bool write,
  		     struct frame_vector *vec)
  {
 -	struct mm_struct *mm = current->mm;
 -	struct vm_area_struct *vma;
 -	int ret_pin_user_pages_fast = 0;
 -	int ret = 0;
 -	int err;
 +	int ret;
- 	unsigned int gup_flags = FOLL_FORCE | FOLL_LONGTERM;
++	unsigned int gup_flags = FOLL_LONGTERM;
  
  	if (nr_frames == 0)
  		return 0;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]