linux-next: manual merge of the v4l-dvb tree with the vfs-brauner-fixes tree

[Stephen Rothwell]

Hi all,

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

  drivers/media/mc/mc-request.c

between commit:

  a260bd22a355 ("media: mc: fix potential use-after-free in media_request_alloc()")

from the vfs-brauner-fixes tree and commit:

  de9f0c2a1ce3 ("media: mc: add debugfs node to keep track of requests")

from the v4l-dvb 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/mc/mc-request.c
index 3cca9a0c7c97,dbea4da5235b..000000000000
--- a/drivers/media/mc/mc-request.c
+++ b/drivers/media/mc/mc-request.c
@@@ -315,12 -318,13 +318,13 @@@ int media_request_alloc(struct media_de
  
  	fd_prepare_file(fdf)->private_data = req;
  
 -	*alloc_fd = fd_publish(fdf);
 -
  	snprintf(req->debug_str, sizeof(req->debug_str), "%u:%d",
 -		 atomic_inc_return(&mdev->request_id), *alloc_fd);
 +		 atomic_inc_return(&mdev->request_id), fd_prepare_fd(fdf));
+ 	atomic_inc(&mdev->num_requests);
  	dev_dbg(mdev->dev, "request: allocated %s\n", req->debug_str);
  
 +	*alloc_fd = fd_publish(fdf);
 +
  	return 0;
  
  err_free_req:

Attachment: pgp8uSrE1rh_4.pgp
Description: OpenPGP digital signature