[rocky9_6] History Rebuild for kernel-5.14.0-570.18.1.el9_6 #306

PlaidCat · 2025-06-03T19:44:57Z

General Process:

Download all unprocessed src.rpm
for each src,pm
- Find all commits in changelog up to last known tag ... in this case 5.14.0-570
- Re-play commits in reverse order (oldest in change log to newest) with git cherry-pick
- After replay replace ENTIRE code in branch with rpmbuild -bp from corresponding src.rpm.
- Tag Rebuild branch
Do local build with https://github.com/ctrliq/kernel-src-tree/wiki/Kernel-Make,-KABI,-Install,-and-Reboot-script

Notes

There is no jira for this yet as we're working on early automation

Checking Rebuild Commits for potentially Missing Commits:

resf_kernel-5.14.0-570.18.1.el9_6

[jmaple@devbox kernel-src-tree]$ cat ciq/ciq_backports/kernel-5.14.0-570.18.1.el9_6/rebuild.details.txt
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%)
_______________________________

__EMPTY COMMITS__________________________
f2e2092a979cd46b43445daf23628015ac776ac3 drm/i915/display: Use joined pipes in dsc helpers for slices, bpp
802a69b6b8a0502a9e2309afec7e1b77f67874f2 drm/i915/dp_mst: Handle error during DSC BW overhead/slice calculation

__CHANGES NOT IN UPSTREAM________________
Porting to Rocky Linux 9, debranding and Rocky branding'
Ensure aarch64 kernel is not compressed'
gitlab-ci: use rhel9.6 builder image

BUILD

Done with Rocky 9.5 User Space Packages

[jmaple@devbox code]$ egrep -B 5 -A 5 "\[TIMER\]|^Starting Build" kbuild.resf_kernel-5.14.0-570.18.1.el9_6.log
/mnt/code/kernel-src-tree
no .config file found, moving on
[TIMER]{MRPROPER}: 0s
x86_64 architecture detected, copying config
'configs/kernel-x86_64-rhel.config' -> '.config'
Setting Local Version for build
CONFIG_LOCALVERSION="-rocky9_6_rebuild-e8b954c95fef"
Making olddefconfig
--
  HOSTCC  scripts/kconfig/util.o
  HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#
Starting Build
  SYNC    include/config/auto.conf.cmd
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_32.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_64.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_x32.h
  SYSTBL  arch/x86/include/generated/asm/syscalls_32.h
--
  BTF [M] sound/usb/snd-usb-audio.ko
  BTF [M] sound/usb/usx2y/snd-usb-usx2y.ko
  BTF [M] sound/virtio/virtio_snd.ko
  BTF [M] sound/x86/snd-hdmi-lpe-audio.ko
  BTF [M] sound/xen/snd_xen_front.ko
[TIMER]{BUILD}: 1664s
Making Modules
  INSTALL /lib/modules/5.14.0-rocky9_6_rebuild-e8b954c95fef/kernel/arch/x86/crypto/blake2s-x86_64.ko
  INSTALL /lib/modules/5.14.0-rocky9_6_rebuild-e8b954c95fef/kernel/arch/x86/crypto/blowfish-x86_64.ko
  INSTALL /lib/modules/5.14.0-rocky9_6_rebuild-e8b954c95fef/kernel/arch/x86/crypto/camellia-aesni-avx-x86_64.ko
  INSTALL /lib/modules/5.14.0-rocky9_6_rebuild-e8b954c95fef/kernel/arch/x86/crypto/camellia-aesni-avx2.ko
--
  SIGN    /lib/modules/5.14.0-rocky9_6_rebuild-e8b954c95fef/kernel/sound/x86/snd-hdmi-lpe-audio.ko
  SIGN    /lib/modules/5.14.0-rocky9_6_rebuild-e8b954c95fef/kernel/sound/virtio/virtio_snd.ko
  SIGN    /lib/modules/5.14.0-rocky9_6_rebuild-e8b954c95fef/kernel/sound/xen/snd_xen_front.ko
  SIGN    /lib/modules/5.14.0-rocky9_6_rebuild-e8b954c95fef/kernel/sound/usb/usx2y/snd-usb-usx2y.ko
  DEPMOD  /lib/modules/5.14.0-rocky9_6_rebuild-e8b954c95fef
[TIMER]{MODULES}: 8s
Making Install
sh ./arch/x86/boot/install.sh 5.14.0-rocky9_6_rebuild-e8b954c95fef \
	arch/x86/boot/bzImage System.map "/boot"
[TIMER]{INSTALL}: 22s
Checking kABI
Checking kABI
kABI check passed
Setting Default Kernel to /boot/vmlinuz-5.14.0-rocky9_6_rebuild-e8b954c95fef and Index to 3
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 0s
[TIMER]{BUILD}: 1664s
[TIMER]{MODULES}: 8s
[TIMER]{INSTALL}: 22s
[TIMER]{TOTAL} 1700s
Rebooting in 10 seconds

KSelfTest

[jmaple@devbox code]$ ls kselftest.5.14.0-rocky9_6_rebuild-9e0e88ac545c.log kselftest.5.14.0-rocky9_6_rebuild-e8b954c95fef.log | while read line; do echo $line; grep '^ok ' $line | wc -l; done
kselftest.5.14.0-rocky9_6_rebuild-9e0e88ac545c.log
317
kselftest.5.14.0-rocky9_6_rebuild-e8b954c95fef.log
316

jira NONE_AUTOMATION Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6 commit-author Ankit Nautiyal <ankit.k.nautiyal@intel.com> commit 26fee9e Add macros to check if platform supports bigjoiner/uncompressed joiner. Replace the existing DISPLAY_VER checks with these. Additionally use it before readout for joiner stuff, where its missing. Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240912132931.1320686-1-ankit.k.nautiyal@intel.com (cherry picked from commit 26fee9e) Signed-off-by: Jonathan Maple <jmaple@ciq.com>

jira NONE_AUTOMATION Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6 commit-author Ankit Nautiyal <ankit.k.nautiyal@intel.com> 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 <ankit.k.nautiyal@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240916102836.2149012-2-ankit.k.nautiyal@intel.com (cherry picked from commit eb920fb) Signed-off-by: Jonathan Maple <jmaple@ciq.com>

jira NONE_AUTOMATION Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6 commit-author Ankit Nautiyal <ankit.k.nautiyal@intel.com> 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 <ankit.k.nautiyal@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240916102836.2149012-3-ankit.k.nautiyal@intel.com (cherry picked from commit d095681) Signed-off-by: Jonathan Maple <jmaple@ciq.com>

jira NONE_AUTOMATION Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6 commit-author Ankit Nautiyal <ankit.k.nautiyal@intel.com> 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 <ankit.k.nautiyal@intel.com> Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240916102836.2149012-4-ankit.k.nautiyal@intel.com (cherry picked from commit f87bdbd) Signed-off-by: Jonathan Maple <jmaple@ciq.com>

jira NONE_AUTOMATION Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6 commit-author Ankit Nautiyal <ankit.k.nautiyal@intel.com> 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 <ankit.k.nautiyal@intel.com> Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com> (v1) Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240916102836.2149012-5-ankit.k.nautiyal@intel.com (cherry picked from commit f2e2092) Signed-off-by: Jonathan Maple <jmaple@ciq.com> # 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 <imre.deak@intel.com> 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: stable@vger.kernel.org # v6.8+ Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20241009110135.1216498-1-imre.deak@intel.com (cherry picked from commit 802a69b) Signed-off-by: Jonathan Maple <jmaple@ciq.com> # 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 <imre.deak@intel.com> 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: stable@vger.kernel.org # v6.8+ Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20241009110135.1216498-2-imre.deak@intel.com (cherry picked from commit 4e75c3e) Signed-off-by: Jonathan Maple <jmaple@ciq.com>

jira NONE_AUTOMATION Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6 commit-author Zijun Hu <quic_zijuhu@quicinc.com> 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 <quic_zijuhu@quicinc.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> (cherry picked from commit 45f745d) Signed-off-by: Jonathan Maple <jmaple@ciq.com>

jira NONE_AUTOMATION cve CVE-2025-21964 Rebuild_History Non-Buildable kernel-5.14.0-570.18.1.el9_6 commit-author Murad Masimov <m.masimov@mt-integration.ru> 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 <m.masimov@mt-integration.ru> Signed-off-by: Steve French <stfrench@microsoft.com> (cherry picked from commit 7489161) Signed-off-by: Jonathan Maple <jmaple@ciq.com>

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

thefossguy-ciq

🚤

bmastbergen

🥌

PlaidCat added 10 commits June 2, 2025 17:43

PlaidCat requested review from bmastbergen, jdieter, juphoff, kerneltoast and thefossguy-ciq June 3, 2025 19:44

PlaidCat self-assigned this Jun 3, 2025

jdieter approved these changes Jun 4, 2025

View reviewed changes

thefossguy-ciq approved these changes Jun 4, 2025

View reviewed changes

bmastbergen approved these changes Jun 4, 2025

View reviewed changes

PlaidCat merged commit e8b954c into rocky9_6 Jun 4, 2025
4 checks passed

PlaidCat deleted the rocky9_6_rebuild branch June 4, 2025 14:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[rocky9_6] History Rebuild for kernel-5.14.0-570.18.1.el9_6 #306

[rocky9_6] History Rebuild for kernel-5.14.0-570.18.1.el9_6 #306

Uh oh!

PlaidCat commented Jun 3, 2025

Uh oh!

thefossguy-ciq left a comment

Uh oh!

bmastbergen left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

[rocky9_6] History Rebuild for kernel-5.14.0-570.18.1.el9_6 #306

[rocky9_6] History Rebuild for kernel-5.14.0-570.18.1.el9_6 #306

Uh oh!

Conversation

PlaidCat commented Jun 3, 2025

Notes

Checking Rebuild Commits for potentially Missing Commits:

resf_kernel-5.14.0-570.18.1.el9_6

BUILD

KSelfTest

Uh oh!

thefossguy-ciq left a comment

Choose a reason for hiding this comment

Uh oh!

bmastbergen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants