From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.10.y 1/2] media: v4l2-ctrls: split up into four source files
Date: Wed, 16 Sep 2026 22:33:19 -0400 [thread overview]
Message-ID: <20260917023320.3876251-1-sashal@kernel.org> (raw)
In-Reply-To: <2026091645-habitat-untoasted-f76f@gregkh>
From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[ Upstream commit 71c689dc2e732d4cb190aaf0edea73116b1611bd ]
The v4l2-ctrls.c source has become much too big, so split it up
into four separate parts:
v4l2-ctrls-core.c: contains the core framework code
v4l2-ctrls-api.c: contains the uAPI interface to the framework
v4l2-ctrls-defs.c: contains the control definitions
v4l2-ctrls-request.c: contains the Request API helpers
And it adds a new v4l2-ctrls-priv.h.
No code was changed, but a number of checkpatch.pl warnings were
fixed (alignment, f == NULL -> !f, long comment block coding style,
unsigned -> unsigned int).
The copyright statements were updated as well since they were
quite out of date.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
[5.10 dependency adaptation for dc694a9929f7]
Limit this dependency to renaming the existing stable v4l2-ctrls.c to
v4l2-ctrls-core.c and updating its object name in the Makefile. Preserve
the source contents byte for byte, including all stable fixes, and keep
v4l2-clk.o in the videodev object list. No functions are added or changed.
The target's HEVC PPS validation context already exists in this stable
source; only the upstream filename is needed for the target to apply.
Drop the remaining source split, private header, and documentation hunk:
those changes are unnecessary for the target, and the documentation file
is absent from this branch. The original subject is retained as required.
[ sashal: Reduced backport -- upstream 71c689dc2e732 touches 8 file(s), this
backport carries 2. Not backported here:
Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst
drivers/media/v4l2-core/v4l2-ctrls-api.c
drivers/media/v4l2-core/v4l2-ctrls.c
drivers/media/v4l2-core/v4l2-ctrls-defs.c
drivers/media/v4l2-core/v4l2-ctrls-priv.h
drivers/media/v4l2-core/v4l2-ctrls-request.c
This note is generated from the file lists only; see the resolution record
for the reasoning. ]
Stable-dep-of: dc694a9929f7 ("media: v4l2-ctrls: validate HEVC tile counts")
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/media/v4l2-core/Makefile | 2 +-
drivers/media/v4l2-core/{v4l2-ctrls.c => v4l2-ctrls-core.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/media/v4l2-core/{v4l2-ctrls.c => v4l2-ctrls-core.c} (100%)
diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile
index 2ef0c7c958a24..a9926ef97db38 100644
--- a/drivers/media/v4l2-core/Makefile
+++ b/drivers/media/v4l2-core/Makefile
@@ -6,7 +6,7 @@
tuner-objs := tuner-core.o
videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-fh.o \
- v4l2-event.o v4l2-ctrls.o v4l2-subdev.o v4l2-clk.o \
+ v4l2-event.o v4l2-ctrls-core.o v4l2-subdev.o v4l2-clk.o \
v4l2-async.o v4l2-common.o
videodev-$(CONFIG_COMPAT) += v4l2-compat-ioctl32.o
videodev-$(CONFIG_TRACEPOINTS) += v4l2-trace.o
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls-core.c
similarity index 100%
rename from drivers/media/v4l2-core/v4l2-ctrls.c
rename to drivers/media/v4l2-core/v4l2-ctrls-core.c
--
2.53.0
next prev parent reply other threads:[~2026-09-17 2:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-16 16:12 FAILED: patch "[PATCH] media: v4l2-ctrls: validate HEVC tile counts" failed to apply to 5.10-stable tree gregkh
2026-09-17 2:33 ` Sasha Levin [this message]
2026-09-17 2:33 ` [PATCH 5.10.y 2/2] media: v4l2-ctrls: validate HEVC tile counts Sasha Levin
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=20260917023320.3876251-1-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=mchehab+huawei@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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