From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mauro Carvalho Chehab <mchehab@kernel•org>,
Christian Brauner <brauner@kernel•org>
Cc: Hans Verkuil <hverkuil+cisco@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mathias Krause <minipli@grsecurity•net>,
Nicolas Dufresne <nicolas.dufresne@collabora•com>
Subject: linux-next: manual merge of the v4l-dvb tree with the vfs-brauner-fixes tree
Date: Wed, 7 Jan 2026 12:30:34 +1100 [thread overview]
Message-ID: <20260107123034.5327acc6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1468 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2026-01-07 1:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260107123034.5327acc6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(echo .)org \
--cc=hverkuil+cisco@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@kernel$(echo .)org \
--cc=minipli@grsecurity$(echo .)net \
--cc=nicolas.dufresne@collabora$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox