jira NONE_AUTOMATION
Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6
commit-author Ankit Nautiyal <[email protected]>
commit eb920fb

Currently intel_joiner_num_pipes is used to get num of pipes wrt num of
pipes joined. Simplify this by returning 1 when no joiner is used and
update the checks for no joiner case.

v2: Rename the function to intel_crtc_num_joined_pipes and use helper
intel_crtc_joined_pipe_mask. (Ville)

	Signed-off-by: Ankit Nautiyal <[email protected]>
	Reviewed-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
(cherry picked from commit eb920fb)
	Signed-off-by: Jonathan Maple <[email protected]>

jira NONE_AUTOMATION
Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6
commit-author Ankit Nautiyal <[email protected]>
commit d095681

In preparation of ultrajoiner, use number of joined pipes in the
intel_dp_joiner_needs_dsc helper, instead of joiner flag.

v2: Use intel_crtc_num_joined_pipes. (Ville)

	Signed-off-by: Ankit Nautiyal <[email protected]>
	Reviewed-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
(cherry picked from commit d095681)
	Signed-off-by: Jonathan Maple <[email protected]>

jira NONE_AUTOMATION
Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6
commit-author Ankit Nautiyal <[email protected]>
commit f87bdbd

In preparation of ultrajoiner, use number of pipes in the
intel_mode_valid_max_plane_size helper, instead of joiner flag.

v2: Use num_joined_pipes 1 where there are no joined pipes (Ville)

	Signed-off-by: Ankit Nautiyal <[email protected]>
	Reviewed-by: Suraj Kandpal <[email protected]>
	Reviewed-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
(cherry picked from commit f87bdbd)
	Signed-off-by: Jonathan Maple <[email protected]>

jira NONE_AUTOMATION
Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6
commit-author Ankit Nautiyal <[email protected]>
commit f2e2092
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.18.1.el9_6/f2e2092a.failed

In preparation of ultrajoiner, use number of joined pipes in the dsc
helpers to compute dsc slices and max compressed bpp, instead of using
the joiner flag.

v2: Adjust the formulae to use num of pipes as 1 (no joiner) or 2
(bigjoiner). (Ankit)

	Signed-off-by: Ankit Nautiyal <[email protected]>
	Reviewed-by: Suraj Kandpal <[email protected]> (v1)
	Reviewed-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
(cherry picked from commit f2e2092)
	Signed-off-by: Jonathan Maple <[email protected]>

# Conflicts:
#	drivers/gpu/drm/i915/display/intel_dp_mst.c

jira NONE_AUTOMATION
Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6
commit-author Imre Deak <[email protected]>
commit 802a69b
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.18.1.el9_6/802a69b6.failed

The MST branch device may not support the number of DSC slices a mode
requires, handle the error in this case.

Fixes: 4e0837a ("drm/i915/dp_mst: Account for FEC and DSC overhead during BW allocation")
	Cc: [email protected] # v6.8+
	Reviewed-by: Suraj Kandpal <[email protected]>
	Signed-off-by: Imre Deak <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
(cherry picked from commit 802a69b)
	Signed-off-by: Jonathan Maple <[email protected]>

# Conflicts:
#	drivers/gpu/drm/i915/display/intel_dp_mst.c

…ble mode

jira NONE_AUTOMATION
Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6
commit-author Imre Deak <[email protected]>
commit 4e75c3e

If an MST branch device doesn't support DSC for a given mode, but the
MST link has enough BW for the mode, assume that the branch device does
support the mode using an uncompressed stream.

Fixes: 55eaef1 ("drm/i915/dp_mst: Handle the Synaptics HBlank expansion quirk")
	Cc: [email protected] # v6.8+
	Reviewed-by: Suraj Kandpal <[email protected]>
	Signed-off-by: Imre Deak <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
(cherry picked from commit 4e75c3e)
	Signed-off-by: Jonathan Maple <[email protected]>

jira NONE_AUTOMATION
Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6
commit-author Zijun Hu <[email protected]>
commit 45f745d

Add one more part with ID (0x0489, 0xe0f3) to usb_device_id table for
Qualcomm WCN785x, and its device info from /sys/kernel/debug/usb/devices
is shown below:

T:  Bus=01 Lev=01 Prnt=01 Port=13 Cnt=03 Dev#=  4 Spd=12   MxCh= 0
D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
P:  Vendor=0489 ProdID=e0f3 Rev= 0.01
C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=1ms
E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
I:  If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
I:  If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
I:  If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
I:  If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
I:  If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms
E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
I:  If#= 1 Alt= 6 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=83(I) Atr=01(Isoc) MxPS=  63 Ivl=1ms
E:  Ad=03(O) Atr=01(Isoc) MxPS=  63 Ivl=1ms
I:  If#= 1 Alt= 7 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=83(I) Atr=01(Isoc) MxPS=  65 Ivl=1ms
E:  Ad=03(O) Atr=01(Isoc) MxPS=  65 Ivl=1ms

	Signed-off-by: Zijun Hu <[email protected]>
	Signed-off-by: Luiz Augusto von Dentz <[email protected]>
(cherry picked from commit 45f745d)
	Signed-off-by: Jonathan Maple <[email protected]>

jira NONE_AUTOMATION
cve CVE-2025-21964
Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6
commit-author Murad Masimov <[email protected]>
commit 7489161

User-provided mount parameter acregmax of type u32 is intended to have
an upper limit, but before it is validated, the value is converted from
seconds to jiffies which can lead to an integer overflow.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 5780464 ("cifs: Add new parameter "acregmax" for distinct file and directory metadata timeout")
	Signed-off-by: Murad Masimov <[email protected]>
	Signed-off-by: Steve French <[email protected]>
(cherry picked from commit 7489161)
	Signed-off-by: Jonathan Maple <[email protected]>

Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v5.14~1..kernel-mainline: 306894
Number of commits in rpm: 14
Number of commits matched with upstream: 11 (78.57%)
Number of commits in upstream but not in rpm: 306885
Number of commits NOT found in upstream: 3 (21.43%)

Rebuilding Kernel on Branch rocky9_6_rebuild_kernel-5.14.0-570.18.1.el9_6 for kernel-5.14.0-570.18.1.el9_6
Clean Cherry Picks: 7 (63.64%)
Empty Cherry Picks: 2 (18.18%)
_______________________________

Full Details Located here:
ciq/ciq_backports/kernel-5.14.0-570.18.1.el9_6/rebuild.details.txt

Includes:
* git commit header above
* Empty Commits with upstream SHA
* RPM ChangeLog Entries that could not be matched

Individual Empty Commit failures contained in the same containing directory.
The git message for empty commits will have the path for the failed commit.
File names are the first 8 characters of the upstream SHA