Skip to content

[RLC 10] Rebase Custom Changes to 6.12.0-124.16.1.el10_1#759

Merged
roxanan1996 merged 2 commits intorlc-10/6.12.0-124.16.1.el10_1from
rnicolescu_rlc-10/6.12.0-124.16.1.el10_1
Dec 9, 2025
Merged

[RLC 10] Rebase Custom Changes to 6.12.0-124.16.1.el10_1#759
roxanan1996 merged 2 commits intorlc-10/6.12.0-124.16.1.el10_1from
rnicolescu_rlc-10/6.12.0-124.16.1.el10_1

Conversation

@roxanan1996
Copy link
Contributor

@roxanan1996 roxanan1996 commented Dec 8, 2025

Update process (This kernel CentOS base for 6.12.0-124)

  • Kernel History Rebuild Process for all src.rpms hosted by RESF
  • Create rlc-10/6.12.0-124.X.1.el10_0 branch
  • Check if any maintained code is included in the new el release.
  • Cherry-pick all code from previous branch into new branch (skipping unneeded code)
    • Fix conflicts as they arise
  • Build and Test

This is the first rebase for 10.1 there are required changes in this PR to make this manageable
ctrliq/kernel-src-tree-tools#41

Removed Commits

None

Rebuild Log

❯ python3 rolling-release-update.py --repo ../kernel-src-tree/ --new-base-branch rocky10_1 --old-rolling-branch rlc-10/6.12.0-124.13.1.el10_1

[rolling release update] Rolling Product:  rlc-10
[rolling release update] Checking out branch:  rlc-10/6.12.0-124.13.1.el10_1
[rolling release update] Gathering all the RESF kernel Tags
[rolling release update] Found 1 RESF kernel tags
[rolling release update] Checking out branch:  rocky10_1
[rolling release update] Gathering all the RESF kernel Tags
[rolling release update] Found 2 RESF kernel tags
[rolling release update] Latest RESF tag sha:  b'83c2a39bfccef'
"83c2a39bfccefce76b9f0767c46899496837d5a1 Rebuild rocky10_1 with kernel-6.12.0-124.13.1.el10_1"
[rolling release update] Checking for FIPS protected changes between the common tag and HEAD
[rolling release update] Checking for FIPS protected changes
[rolling release update] Getting SHAS 83c2a39bfccef..HEAD
[rolling release update] Number of commits to check:  18
[rolling release update] Checking modifications of shas
[rolling release update] Checked 1 of 18 commits
[rolling release update] Checked 2 of 18 commits
[rolling release update] Checked 3 of 18 commits
[rolling release update] Checked 4 of 18 commits
[rolling release update] Checked 5 of 18 commits
[rolling release update] Checked 6 of 18 commits
[rolling release update] Checked 7 of 18 commits
[rolling release update] Checked 8 of 18 commits
[rolling release update] Checked 9 of 18 commits
[rolling release update] Checked 10 of 18 commits
[rolling release update] Checked 11 of 18 commits
[rolling release update] Checked 12 of 18 commits
[rolling release update] Checked 13 of 18 commits
[rolling release update] Checked 14 of 18 commits
[rolling release update] Checked 15 of 18 commits
[rolling release update] Checked 16 of 18 commits
[rolling release update] Checked 17 of 18 commits
[rolling release update] Checked 18 of 18 commits
[rolling release update] 0 of 18 commits have FIPS protected changes
[rolling release update] Checking out old rolling branch:  rlc-10/6.12.0-124.13.1.el10_1
[rolling release update] Finding the CIQ Kernel and Associated Upstream commits between the last resf tag and HEAD
[rolling release update] Last RESF tag sha:  b'83c2a39bfccef'
[rolling release update] Total commits in old branch: 2
[rolling release update] Checking out new base branch:  rocky10_1
[rolling release update] Finding the kernel version for the new rolling release
[rolling release update] New Branch to create: rlc-10/6.12.0-124.16.1.el10_1
[rolling release update] Creating new branch: rlc-10/6.12.0-124.16.1.el10_1
[rolling release update] Creating new branch for PR:  rnicolescu_rlc-10/6.12.0-124.16.1.el10_1
[rolling release update] Creating Map of all new commits from last rolling release fork
[rolling release update] Total commits in new branch: 17
[rolling release update] Checking if any of the commits from the old rolling release are already present in the new base branch
[rolling release update] Found 0 duplicate commits to remove
[rolling release update] Applying 2 remaining commits to the new branch
[1/2] 22cd1182c4ca0 tools: hv: Enable debug logs for hv_kvp_daemon
[2/2] 031783ea28cbc github actions: Add build checks for Rocky10 on supported Architectures
[rolling release update] Successfully applied all 2 commits

Build

  CLEAN   scripts/mod
  CLEAN   scripts/selinux/genheaders
  CLEAN   scripts/selinux/mdp
  CLEAN   scripts
  CLEAN   include/config include/generated arch/x86/include/generated .config .config.old .version Module.symvers certs/signing_key.pem certs/x509.genkey
[TIMER]{MRPROPER}: 7s
x86_64 architecture detected, copying config
'configs/kernel-x86_64-rhel.config' -> '.config'
Setting Local Version for build
CONFIG_LOCALVERSION="-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34"
Making olddefconfig
--
  HOSTCC  scripts/kconfig/util.o
  HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#
Starting Build
  GEN     arch/x86/include/generated/asm/orc_hash.h
  WRAP    arch/x86/include/generated/uapi/asm/bpf_perf_event.h
  WRAP    arch/x86/include/generated/uapi/asm/errno.h
  WRAP    arch/x86/include/generated/uapi/asm/fcntl.h
  WRAP    arch/x86/include/generated/uapi/asm/ioctl.h
--
  LD [M]  net/qrtr/qrtr-mhi.ko
  LD [M]  virt/lib/irqbypass.ko
  BTF [M] net/hsr/hsr.ko
  BTF [M] net/qrtr/qrtr-mhi.ko
  BTF [M] virt/lib/irqbypass.ko
[TIMER]{BUILD}: 2133s
Making Modules
  SYMLINK /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+/build
  INSTALL /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+/modules.order
  INSTALL /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+/modules.builtin
  INSTALL /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+/modules.builtin.modinfo
--
  SIGN    /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+/kernel/virt/lib/irqbypass.ko
  SIGN    /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+/kernel/net/qrtr/qrtr-mhi.ko
  STRIP   /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+/kernel/drivers/rtc/rtc-rx4581.ko
  SIGN    /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+/kernel/drivers/rtc/rtc-rx4581.ko
  DEPMOD  /lib/modules/6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+
[TIMER]{MODULES}: 10s
Making Install
  INSTALL /boot
sed: can't read /home/rnicolescu/ciq/kernels/rlc-10/kernel-src-tree/arch/x86/boot/.bzImage.hmac: No such file or directory
Can't create '/boot/.vmlinuz-0-rescue-430c94a82182428fa3e85332a4f54141.hmac' from '/home/rnicolescu/ciq/kernels/rlc-10/kernel-src-tree/arch/x86/boot/.bzImage.hmac'!
kdump: For kernel=/boot/vmlinuz-6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+, crashkernel=2G-64G:256M,64G-:512M now. Please reboot the system for the change to take effect. Note if you don't want kdump-utils to manage the crashkernel kernel parameter, please set auto_reset_crashkernel=no in /etc/kdump.conf.
[TIMER]{INSTALL}: 29s
Checking kABI
kABI check passed
Setting Default Kernel to /boot/vmlinuz-6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+ and Index to 2
The default is /boot/loader/entries/430c94a82182428fa3e85332a4f54141-6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+.conf with index 2 and kernel /boot/vmlinuz-6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+
The default is /boot/loader/entries/430c94a82182428fa3e85332a4f54141-6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+.conf with index 2 and kernel /boot/vmlinuz-6.12.0-rnicolescu_rlc-10_6.12.0-124.16.1.el10_1-3a95b74b7a34+
Generating grub configuration file ...
Adding boot menu entry for UEFI Firmware Settings ...
done
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 7s
[TIMER]{BUILD}: 2133s
[TIMER]{MODULES}: 10s
[TIMER]{INSTALL}: 29s
[TIMER]{TOTAL} 2183s
Rebooting in 10 seconds

kernel-build-after.log
kernel-build-before.log

KSelfTest

❯ ~/ciq/kernel-tools/kselftest-diff.sh .
./kselftest-after.log
524
./kselftest-before.log
515
Before: ./kselftest-after.log
After: ./kselftest-before.log
Diff:
-ok 14 selftests: net: bind_wildcard
-ok 1 selftests: pidfd: pidfd_test
-ok 2 selftests: pidfd: pidfd_fdinfo_test
-ok 3 selftests: pidfd: pidfd_open_test
-ok 4 selftests: pidfd: pidfd_poll_test
-ok 5 selftests: pidfd: pidfd_wait
-ok 6 selftests: pidfd: pidfd_getfd_test
-ok 7 selftests: pidfd: pidfd_setns_test
-ok 7 selftests: timers: raw_skew

kselftest-after.log
kselftest-before.log

@PlaidCat @roxanan1996
tools: hv: Enable debug logs for hv_kvp_daemon
a55c143 
jira LE-3207
feature tools_hv
commit-author Shradha Gupta <shradhagupta@linux.microsoft.com>
commit a9c0b33

Allow the KVP daemon to log the KVP updates triggered in the VM
with a new debug flag(-d).
When the daemon is started with this flag, it logs updates and debug
information in syslog with loglevel LOG_DEBUG. This information comes
in handy for debugging issues where the key-value pairs for certain
pools show mismatch/incorrect values.
The distro-vendors can further consume these changes and modify the
respective service files to redirect the logs to specific files as
needed.

	Signed-off-by: Shradha Gupta <shradhagupta@linux.microsoft.com>
	Reviewed-by: Naman Jain <namjain@linux.microsoft.com>
	Reviewed-by: Dexuan Cui <decui@microsoft.com>
Link: https://lore.kernel.org/r/1744715978-8185-1-git-send-email-shradhagupta@linux.microsoft.com
	Signed-off-by: Wei Liu <wei.liu@kernel.org>
Message-ID: <1744715978-8185-1-git-send-email-shradhagupta@linux.microsoft.com>
(cherry picked from commit a9c0b33)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
Signed-off-by: Jonathan Maple <jmaple@ciq.com>
Signed-off-by: Roxana Nicolescu <rnicolescu@ciq.com>
@PlaidCat @roxanan1996
github actions: Add build checks for Rocky10 on supported Architectures
3a95b74 
Signed-off-by: Roxana Nicolescu <rnicolescu@ciq.com>
@roxanan1996 roxanan1996 requested a review from a team December 8, 2025 18:07
bmastbergen
bmastbergen approved these changes Dec 8, 2025
View reviewed changes
Copy link
Collaborator

@bmastbergen bmastbergen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥌

@roxanan1996 roxanan1996 requested a review from a team December 9, 2025 09:34
@roxanan1996 roxanan1996 merged commit e236fc2 into rlc-10/6.12.0-124.16.1.el10_1 Dec 9, 2025
4 checks passed
@roxanan1996 roxanan1996 deleted the rnicolescu_rlc-10/6.12.0-124.16.1.el10_1 branch December 9, 2025 10:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bmastbergen bmastbergen bmastbergen approved these changes

@shreeya-patel98 shreeya-patel98 shreeya-patel98 approved these changes

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@roxanan1996 @bmastbergen @shreeya-patel98 @PlaidCat