[rocky9_6] History Rebuild for kernel-5.14.0-570.23.1.el9_6

.github/workflows/build-check_aarch64-rt.yml

@@ -19,8 +19,11 @@ jobs:
     steps:
       - name: Install tools and Libraries
         run: |
-          dnf groupinstall 'Development Tools' -y
+          dnf update -y
+          dnf install 'dnf-command(config-manager)' -y
+          dnf config-manager --set-enabled devel
           dnf install --enablerepo=crb bc dwarves kernel-devel openssl-devel elfutils-libelf-devel -y
+          dnf groupinstall 'Development Tools' -y
       - name: Checkout code
         uses: actions/checkout@v4
         with:

.github/workflows/build-check_aarch64.yml

@@ -19,8 +19,11 @@ jobs:
     steps:
       - name: Install tools and Libraries
         run: |
-          dnf groupinstall 'Development Tools' -y
+          dnf update -y
+          dnf install 'dnf-command(config-manager)' -y
+          dnf config-manager --set-enabled devel
           dnf install --enablerepo=crb bc dwarves kernel-devel openssl-devel elfutils-libelf-devel -y
+          dnf groupinstall 'Development Tools' -y
       - name: Checkout code
         uses: actions/checkout@v4
         with:

.github/workflows/build-check_x86_64-rt.yml

@@ -19,8 +19,11 @@ jobs:
     steps:
       - name: Install tools and Libraries
         run: |
-          dnf groupinstall 'Development Tools' -y
+          dnf update -y
+          dnf install 'dnf-command(config-manager)' -y
+          dnf config-manager --set-enabled devel
           dnf install --enablerepo=crb bc dwarves kernel-devel openssl-devel elfutils-libelf-devel -y
+          dnf groupinstall 'Development Tools' -y
       - name: Checkout code
         uses: actions/checkout@v4
         with:

.github/workflows/build-check_x86_64.yml

@@ -19,8 +19,11 @@ jobs:
     steps:
       - name: Install tools and Libraries
         run: |
-          dnf groupinstall 'Development Tools' -y
+          dnf update -y
+          dnf install 'dnf-command(config-manager)' -y
+          dnf config-manager --set-enabled devel
           dnf install --enablerepo=crb bc dwarves kernel-devel openssl-devel elfutils-libelf-devel -y
+          dnf groupinstall 'Development Tools' -y
       - name: Checkout code
         uses: actions/checkout@v4
         with:

Makefile.rhelver

@@ -12,7 +12,7 @@ RHEL_MINOR = 6
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 570.22.1
+RHEL_RELEASE = 570.23.1
 
 #
 # ZSTREAM

ciq/ciq_backports/kernel-5.14.0-570.23.1.el9_6/c692696f.failed

@@ -0,0 +1,44 @@
+media: saa6752hs: Don't set format in sub-device state
+
+jira LE-3428
+Rebuild_History Non-Buildable kernel-5.14.0-570.23.1.el9_6
+commit-author Sakari Ailus <sakari.ailus@linux.intel.com>
+commit c692696fc51c5acee555b94d391d328510b557c8
+Empty-Commit: Cherry-Pick Conflicts during history rebuild.
+Will be included in final tarball splat. Ref for failed cherry-pick at:
+ciq/ciq_backports/kernel-5.14.0-570.23.1.el9_6/c692696f.failed
+
+For the purpose of setting old non-pad based sub-device try format as a
+basis for VIDIOC_TRY_FMT implementation, there is no need to set the
+format in the sub-device state. Drop the assignment to the state, which
+would result in a NULL pointer dereference.
+
+Fixes: fd17e3a9a788 ("media: i2c: Use accessors for pad config 'try_*' fields")
+	Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
+	Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
+	Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+(cherry picked from commit c692696fc51c5acee555b94d391d328510b557c8)
+	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
+
+# Conflicts:
+#	drivers/media/i2c/saa6752hs.c
+diff --cc drivers/media/i2c/saa6752hs.c
+index a7f043cad149,897eaa669b86..000000000000
+--- a/drivers/media/i2c/saa6752hs.c
++++ b/drivers/media/i2c/saa6752hs.c
+@@@ -594,10 -594,8 +594,13 @@@ static int saa6752hs_set_fmt(struct v4l
+  	f->field = V4L2_FIELD_INTERLACED;
+  	f->colorspace = V4L2_COLORSPACE_SMPTE170M;
+
+++<<<<<<< HEAD
+ +	if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
+ +		sd_state->pads->try_fmt = *f;
+++=======
++ 	if (format->which == V4L2_SUBDEV_FORMAT_TRY)
+++>>>>>>> c692696fc51c (media: saa6752hs: Don't set format in sub-device state)
+  		return 0;
+- 	}
+
+  	/*
+  	  FIXME: translate and round width/height into EMPRESS
+* Unmerged path drivers/media/i2c/saa6752hs.c