[RLC 10] Rebase Custom Changes to 6.12.0-124.1.1.el10_1 #730

PlaidCat · 2025-11-26T21:41:44Z

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

[rolling release update] Total commits in new branch: 15219
[rolling release update] Checking if any of the commits from the old rolling release are already present in the new base branch
- Old commit cab1953548b0 backported upstream 45a442fe369e
  Already in new base as 858f86370f69: Drivers: hv: vmbus: Remove vmbus_sendpacket_pagebuffer()
- Old commit 37f22df41dba backported upstream 5bbc644bbf4e
  Already in new base as 98494daee7b5: hv_netvsc: Remove rmsg_pgcnt
- Old commit c47047aac221 backported upstream 41a6328b2c55
  Already in new base as 82c80fd013cc: hv_netvsc: Preserve contiguous PFN grouping in the page buffer array
- Old commit 7a43cb7859a4 backported upstream 4f98616b855c
  Already in new base as 21dfed2ce049: hv_netvsc: Use vmbus_sendpacket_mpb_desc() to send VMBus messages
- Old commit 4123197d78e9 backported upstream 380b75d30786
  Already in new base as 47aec3c40ae7: Drivers: hv: Allow vmbus_sendpacket_mpb_desc() to create multiple ranges
- Old commit 3f7c080e5f7c backported upstream b2f966568faa
  Already in new base as 2463b66492be: scsi: storvsc: Increase the timeouts to storvsc_timeout
[rolling release update] Found 6 duplicate commits to remove
[rolling release update] Removing duplicate commits:
  - cab1953548b088cea097651d27f92d898a779783 Drivers: hv: vmbus: Remove vmbus_sendpacket_pagebuffer()
  - 37f22df41dba4582452f81c58d343f682135e466 hv_netvsc: Remove rmsg_pgcnt
  - c47047aac221007768d0a8e8c76eadc5a50b28e7 hv_netvsc: Preserve contiguous PFN grouping in the page buffer array
  - 7a43cb7859a45dc7cdb44b3a9c92cb744391f9a2 hv_netvsc: Use vmbus_sendpacket_mpb_desc() to send VMBus messages
  - 4123197d78e9b91311a37ae4b3b65a0f6b7d6670 Drivers: hv: Allow vmbus_sendpacket_mpb_desc() to create multiple ranges
  - 3f7c080e5f7c0d625823730960517375ee74b9e0 scsi: storvsc: Increase the timeouts to storvsc_timeout

Rebuild Log

[jmaple@devbox kernel-src-tree-tools]$ python3 rolling-release-update.py --repo ../kernel-src-tree-rolling/ --new-base-branch rocky10_1 --old-rolling-branch rlc-10/6.12.0-55.43.1.el10_0 --new_minor_version --interactive
[rolling release update] Rolling Product:  rlc-10
[rolling release update] New Minor Version:  True
[rolling release update] Checking out branch:  rlc-10/6.12.0-55.43.1.el10_0
[rolling release update] Gathering all the RESF kernel Tags
[rolling release update] Found 55 RESF kernel tags
[rolling release update] Checking out branch:  rocky10_1
[rolling release update] Gathering all the RESF kernel Tags
[rolling release update] Found 101 RESF kernel tags
[rolling release update] Common tag sha:  b'91caaa229048'
"91caaa229048a31211d9f39f1ba50b2d6c78543c [redhat] kernel-6.12.0-55.el10"
[rolling release update] Checking out old rolling branch:  rlc-10/6.12.0-55.43.1.el10_0
[rolling release update] Finding the CIQ Kernel and Associated Upstream commits between the last resf tag and HEAD
[rolling release update] Getting SHAS 11e6cfbb09b9..HEAD
Already on 'rlc-10/6.12.0-55.43.1.el10_0'
[rolling release update] Last RESF tag sha:  b'91caaa229048'
[rolling release update] Total commits in old branch: 7
[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.13.1.el10_1
[rolling release update] Creating new branch: rlc-10/6.12.0-124.13.1.el10_1
[rolling release update] Creating new branch for PR:  jmaple_rlc-10/6.12.0-124.13.1.el10_1
[rolling release update] Creating Map of all new commits from last rolling release fork
Already on 'jmaple_rlc-10/6.12.0-124.13.1.el10_1'
WARNING: ae1ae11fb277f1335d6bcd4935ba0ea985af3c32 already in upstream_commits

[SNIP]

WARNING: 52c11d31b5a1d1c747bb5f36cc4808e93e2348f4 already in upstream_commits
[rolling release update] Total commits in new branch: 15219
[rolling release update] Checking if any of the commits from the old rolling release are already present in the new base branch
- Old commit cab1953548b0 backported upstream 45a442fe369e
  Already in new base as 858f86370f69: Drivers: hv: vmbus: Remove vmbus_sendpacket_pagebuffer()
- Old commit 37f22df41dba backported upstream 5bbc644bbf4e
  Already in new base as 98494daee7b5: hv_netvsc: Remove rmsg_pgcnt
- Old commit c47047aac221 backported upstream 41a6328b2c55
  Already in new base as 82c80fd013cc: hv_netvsc: Preserve contiguous PFN grouping in the page buffer array
- Old commit 7a43cb7859a4 backported upstream 4f98616b855c
  Already in new base as 21dfed2ce049: hv_netvsc: Use vmbus_sendpacket_mpb_desc() to send VMBus messages
- Old commit 4123197d78e9 backported upstream 380b75d30786
  Already in new base as 47aec3c40ae7: Drivers: hv: Allow vmbus_sendpacket_mpb_desc() to create multiple ranges
- Old commit 3f7c080e5f7c backported upstream b2f966568faa
  Already in new base as 2463b66492be: scsi: storvsc: Increase the timeouts to storvsc_timeout
[rolling release update] Found 6 duplicate commits to remove
[rolling release update] Removing duplicate commits:
  - cab1953548b088cea097651d27f92d898a779783 Drivers: hv: vmbus: Remove vmbus_sendpacket_pagebuffer()
  - 37f22df41dba4582452f81c58d343f682135e466 hv_netvsc: Remove rmsg_pgcnt
  - c47047aac221007768d0a8e8c76eadc5a50b28e7 hv_netvsc: Preserve contiguous PFN grouping in the page buffer array
  - 7a43cb7859a45dc7cdb44b3a9c92cb744391f9a2 hv_netvsc: Use vmbus_sendpacket_mpb_desc() to send VMBus messages
  - 4123197d78e9b91311a37ae4b3b65a0f6b7d6670 Drivers: hv: Allow vmbus_sendpacket_mpb_desc() to create multiple ranges
  - 3f7c080e5f7c0d625823730960517375ee74b9e0 scsi: storvsc: Increase the timeouts to storvsc_timeout
[rolling release update] Applying 1 remaining commits to the new branch
  [1/1] c374ac41e5fe tools: hv: Enable debug logs for hv_kvp_daemon
[rolling release update] Successfully applied all 1 commits

Build

[jmaple@devbox code]$ egrep -B 5 -A 5 "\[TIMER\]|^Starting Build" $(ls -t kbuild* | head -n1)
/mnt/code/kernel-src-tree-build
Running make mrproper...
[TIMER]{MRPROPER}: 7s
x86_64 architecture detected, copying config
'configs/kernel-x86_64-rhel.config' -> '.config'
Setting Local Version for build
CONFIG_LOCALVERSION="-jmaple_rlc-10_6.12.0-124.13.1.el10_1-c1cc28cd0535"
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
  BTF [M] net/hsr/hsr.ko
  BTF [M] net/qrtr/qrtr-mhi.ko
  LD [M]  virt/lib/irqbypass.ko
  BTF [M] virt/lib/irqbypass.ko
[TIMER]{BUILD}: 1947s
Making Modules
  SYMLINK /lib/modules/6.12.0-jmaple_rlc-10_6.12.0-124.13.1.el10_1-c1cc28cd0535+/build
  INSTALL /lib/modules/6.12.0-jmaple_rlc-10_6.12.0-124.13.1.el10_1-c1cc28cd0535+/modules.order
  INSTALL /lib/modules/6.12.0-jmaple_rlc-10_6.12.0-124.13.1.el10_1-c1cc28cd0535+/modules.builtin
  INSTALL /lib/modules/6.12.0-jmaple_rlc-10_6.12.0-124.13.1.el10_1-c1cc28cd0535+/modules.builtin.modinfo
--
  SIGN    /lib/modules/6.12.0-jmaple_rlc-10_6.12.0-124.13.1.el10_1-c1cc28cd0535+/kernel/net/hsr/hsr.ko
  SIGN    /lib/modules/6.12.0-jmaple_rlc-10_6.12.0-124.13.1.el10_1-c1cc28cd0535+/kernel/net/qrtr/qrtr-mhi.ko
  STRIP   /lib/modules/6.12.0-jmaple_rlc-10_6.12.0-124.13.1.el10_1-c1cc28cd0535+/kernel/virt/lib/irqbypass.ko
  SIGN    /lib/modules/6.12.0-jmaple_rlc-10_6.12.0-124.13.1.el10_1-c1cc28cd0535+/kernel/virt/lib/irqbypass.ko
  DEPMOD  /lib/modules/6.12.0-jmaple_rlc-10_6.12.0-124.13.1.el10_1-c1cc28cd0535+
[TIMER]{MODULES}: 10s
Making Install
  INSTALL /boot
[TIMER]{INSTALL}: 30s
Checking kABI
kABI check passed
Setting Default Kernel to /boot/vmlinuz-6.12.0-jmaple_rlc-10_6.12.0-124.13.1.el10_1-c1cc28cd0535+ and Index to 2
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 7s
[TIMER]{BUILD}: 1947s
[TIMER]{MODULES}: 10s
[TIMER]{INSTALL}: 30s
[TIMER]{TOTAL} 1999s
Rebooting in 10 seconds

KSelfTest

[jmaple@devbox code]$ ~/workspace/auto_kernel_history_rebuild/Rocky10/rocky10/code/get_kselftest_diff.sh
kselftest.6.12.0-jmaple_rlc-10_6.12.0-55.43.1.el10_0-cab1953548b0+.log
507
kselftest.6.12.0-rocky10_1_rebuild-fce35d15f757+.log
459
kselftest.6.12.0-rocky10_1_rebuild-83c2a39bfcce+.log
458
kselftest.6.12.0-jmaple_rlc-10_6.12.0-124.13.1.el10_1-c1cc28cd0535+.log
458
Before: kselftest.6.12.0-rocky10_1_rebuild-83c2a39bfcce+.log
After: kselftest.6.12.0-jmaple_rlc-10_6.12.0-124.13.1.el10_1-c1cc28cd0535+.log
Diff:
No differences found.

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>

jdieter

LGTM

PlaidCat requested a review from a team November 26, 2025 21:41

PlaidCat self-assigned this Nov 26, 2025

github actions: Add build checks for Rocky10 on supported Architectures

cd1b708

jdieter approved these changes Nov 26, 2025

View reviewed changes

shreeya-patel98 approved these changes Nov 27, 2025

View reviewed changes

jdieter merged commit 031783e into rlc-10/6.12.0-124.13.1.el10_1 Nov 27, 2025
4 checks passed

jdieter deleted the jmaple_rlc-10/6.12.0-124.13.1.el10_1 branch November 27, 2025 10:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[RLC 10] Rebase Custom Changes to 6.12.0-124.1.1.el10_1 #730

[RLC 10] Rebase Custom Changes to 6.12.0-124.1.1.el10_1 #730

Uh oh!

PlaidCat commented Nov 26, 2025 •

edited

Loading

Uh oh!

jdieter left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

[RLC 10] Rebase Custom Changes to 6.12.0-124.1.1.el10_1 #730

[RLC 10] Rebase Custom Changes to 6.12.0-124.1.1.el10_1 #730

Uh oh!

Conversation

PlaidCat commented Nov 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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

Removed Commits

Rebuild Log

Build

KSelfTest

Uh oh!

jdieter left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

PlaidCat commented Nov 26, 2025 •

edited

Loading

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