FAILED: patch "[PATCH] media: uapi: rkisp: Correct name version enum" failed to apply to 6.12-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x c4c01c4fd4a3916ffdfb35ad9f511c48e289f51c
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072953-hamburger-filter-279e@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From c4c01c4fd4a3916ffdfb35ad9f511c48e289f51c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20S=C3=B6derlund?=
<[email protected]>
Date: Fri, 1 May 2026 21:03:39 +0200
Subject: [PATCH] media: uapi: rkisp: Correct name version enum
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The name of the enum to hold the mapping of parameter buffer versions have a typo in the name, correct it. While this is a uAPI header the impact should be minimal as the enum is only used as a collection for the one version number supported.
include/uapi/linux/rkisp1-config.h +3 -3
@@ -1535,11 +1535,11 @@ struct rkisp1_ext_params_wdr_config { sizeof(struct rkisp1_ext_params_wdr_config))/** -* enum rksip1_ext_param_buffer_version - RkISP1 extensible parameters version +* enum rkisp1_ext_param_buffer_version - RkISP1 extensible parameters version * * @RKISP1_EXT_PARAM_BUFFER_V1: First version of RkISP1 extensible parameters */ -enum rksip1_ext_param_buffer_version { +enum rkisp1_ext_param_buffer_version {RKISP1_EXT_PARAM_BUFFER_V1 =V4L2_ISP_PARAMS_VERSION_V1 , };
@@ -1601,7 +1601,7 @@ enum rksip1_ext_param_buffer_version {* +---------------------------------------------------------------------+ * * @version: The RkISP1 extensible parameters buffer version, see -* :c:type:`rksip1_ext_param_buffer_version` +* :c:type:`rkisp1_ext_param_buffer_version` * @data_size: The RkISP1 configuration data effective size, excluding this * header * @data: The RkISP1 extensible configuration data blocks
Sasha Levin
maintainerPATCH 1/1 media: uapi: rkisp: Correct name version enum
From: Niklas Söderlund <[email protected]>
[ Upstream commit c4c01c4fd4a3916ffdfb35ad9f511c48e289f51c ]
The name of the enum to hold the mapping of parameter buffer versions have a typo in the name, correct it. While this is a uAPI header the impact should be minimal as the enum is only used as a collection for the one version number supported.
--- include/uapi/linux/rkisp1-config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/uapi/linux/rkisp1-config.h +3 -3
@@ -1487,11 +1487,11 @@ struct rkisp1_ext_params_compand_curve_config { sizeof(struct rkisp1_ext_params_compand_curve_config))/** -* enum rksip1_ext_param_buffer_version - RkISP1 extensible parameters version +* enum rkisp1_ext_param_buffer_version - RkISP1 extensible parameters version * * @RKISP1_EXT_PARAM_BUFFER_V1: First version of RkISP1 extensible parameters */ -enum rksip1_ext_param_buffer_version { +enum rkisp1_ext_param_buffer_version {RKISP1_EXT_PARAM_BUFFER_V1 =1 , };
@@ -1563,7 +1563,7 @@ enum rksip1_ext_param_buffer_version {* +---------------------------------------------------------------------+ * * @version: The RkISP1 extensible parameters buffer version, see -* :c:type:`rksip1_ext_param_buffer_version` +* :c:type:`rkisp1_ext_param_buffer_version` * @data_size: The RkISP1 configuration data effective size, excluding this * header * @data: The RkISP1 extensible configuration data blocks
Signature · 1 line
2.53.0