Skip to content

[rocky10_1] History Rebuild through kernel-6.12.0-124.40.1.el10_1#936

Merged
PlaidCat merged 9 commits intorocky10_1from
rocky10_1_rebuild
Mar 3, 2026
Merged

[rocky10_1] History Rebuild through kernel-6.12.0-124.40.1.el10_1#936
PlaidCat merged 9 commits intorocky10_1from
rocky10_1_rebuild

Conversation

@PlaidCat
Copy link
Collaborator

@PlaidCat PlaidCat commented Mar 3, 2026 •
edited by atlassian bot
Loading

This is an automated kernel history rebuild using cron and internal tooling. It follows the same process used for previous history rebuilds:

  • Download all unprocessed src.rpm packages
  • For each src.rpm:
    • Identify all commits in the changelog up to the last known tag (6.12.0-124)
    • Replay commits in chronological order (oldest to newest in the changelog) using git cherry-pick
    • Replace the code in the branch with the output of rpmbuild -bp for the corresponding src.rpm
    • Tag the rebuild branch

JIRA Tickets

Rebuild Splat Inspection

kernel-6.12.0-124.40.1.el10_1

$ cat ciq/ciq_backports/kernel-6.12.0-124.40.1.el10_1/rebuild.details.txt
Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v6.12~1..kernel-mainline: 93416
Number of commits in rpm: 17
Number of commits matched with upstream: 8 (47.06%)
Number of commits in upstream but not in rpm: 93408
Number of commits NOT found in upstream: 9 (52.94%)

Rebuilding Kernel on Branch rocky10_1_rebuild_kernel-6.12.0-124.40.1.el10_1 for kernel-6.12.0-124.40.1.el10_1
Clean Cherry Picks: 5 (62.50%)
Empty Cherry Picks: 3 (37.50%)
_______________________________

__EMPTY COMMITS__________________________
855982a52ff7d188188f0ecf86c2ce95957202c6 smb: client: relax session and tcon reconnect attempts
7ad785927d9eb348adb381d168ed73d0dd3c7670 smb: client: Add tracepoint for krb5 auth
31475b88110c4725b4f9a79c3a0d9bbf97e69e1c s390/mm: Fix __ptep_rdp() inline assembly

__CHANGES NOT IN UPSTREAM________________
Add partial riscv64 support for build root'
Provide basic VisionFive 2 support'
Patch MMU for riscv64'
ice: PTP: fix missing timestamps on E825 hardware
fou: Don't allow 0 for FOU_ATTR_IPPROTO.
tools: ynl: Specify --no-line-number in ynl-regen.sh.
gue: Fix skb memleak with inner IP protocol 0.
redhat: enable FOU modules in kernel-modules-extra
ALSA: hda/realtek - Enable Mute LED for Lenovo platform

BUILD

$ grep -E -B 5 -A 5 "\[TIMER\]|^Starting Build" $(ls -t kbuild* | head -n1)
/mnt/code/kernel-src-tree-build
Running make mrproper...
  CLEAN   scripts/basic
  CLEAN   scripts/kconfig
  CLEAN   include/config include/generated
[TIMER]{MRPROPER}: 7s
x86_64 architecture detected, copying config
'configs/kernel-x86_64-rhel.config' -> '.config'
Setting Local Version for build
CONFIG_LOCALVERSION="-rocky10_1_rebuild-16ddd0825bd1"
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/ioctls.h
--
  LD [M]  net/qrtr/qrtr-mhi.ko
  BTF [M] net/qrtr/qrtr.ko
  LD [M]  virt/lib/irqbypass.ko
  BTF [M] net/qrtr/qrtr-mhi.ko
  BTF [M] virt/lib/irqbypass.ko
[TIMER]{BUILD}: 1985s
Making Modules
  SYMLINK /lib/modules/6.12.0-rocky10_1_rebuild-16ddd0825bd1+/build
  INSTALL /lib/modules/6.12.0-rocky10_1_rebuild-16ddd0825bd1+/modules.order
  INSTALL /lib/modules/6.12.0-rocky10_1_rebuild-16ddd0825bd1+/modules.builtin
  INSTALL /lib/modules/6.12.0-rocky10_1_rebuild-16ddd0825bd1+/modules.builtin.modinfo
--
  STRIP   /lib/modules/6.12.0-rocky10_1_rebuild-16ddd0825bd1+/kernel/net/qrtr/qrtr-mhi.ko
  SIGN    /lib/modules/6.12.0-rocky10_1_rebuild-16ddd0825bd1+/kernel/virt/lib/irqbypass.ko
  SIGN    /lib/modules/6.12.0-rocky10_1_rebuild-16ddd0825bd1+/kernel/net/qrtr/qrtr-mhi.ko
  SIGN    /lib/modules/6.12.0-rocky10_1_rebuild-16ddd0825bd1+/kernel/net/qrtr/qrtr.ko
  DEPMOD  /lib/modules/6.12.0-rocky10_1_rebuild-16ddd0825bd1+
[TIMER]{MODULES}: 10s
Making Install
  INSTALL /boot
[TIMER]{INSTALL}: 17s
Checking kABI
kABI check passed
Setting Default Kernel to /boot/vmlinuz-6.12.0-rocky10_1_rebuild-16ddd0825bd1+ and Index to 2
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 7s
[TIMER]{BUILD}: 1985s
[TIMER]{MODULES}: 10s
[TIMER]{INSTALL}: 17s
[TIMER]{TOTAL} 2022s
Rebooting in 10 seconds

KSelfTests

$ get_kselftest_diff.sh
kselftest.6.12.0-rocky10_1_rebuild-cf93036bafdb+.log
458
kselftest.6.12.0-rocky10_1_rebuild-d6ba498d5a6b+.log
458
kselftest.6.12.0-rocky10_1_rebuild-b81a81d85ff8+.log
459
kselftest.6.12.0-rocky10_1_rebuild-16ddd0825bd1+.log
458
Before: kselftest.6.12.0-rocky10_1_rebuild-b81a81d85ff8+.log
After: kselftest.6.12.0-rocky10_1_rebuild-16ddd0825bd1+.log
Diff:
-ok 7 selftests: timers: raw_skew

PlaidCat added 9 commits March 3, 2026 09:46
@PlaidCat
cifs: #include cifsglob.h before trace.h to allow structs in tracepoints
0762d8b 
jira KERNEL-710
Rebuild_History Non-Buildable kernel-6.12.0-124.40.1.el10_1
commit-author David Howells <dhowells@redhat.com>
commit 64c9471

Make cifs #include cifsglob.h in advance of #including trace.h so that the
structures defined in cifsglob.h can be accessed directly by the cifs
tracepoints rather than the callers having to manually pass in the bits and
pieces.

This should allow the tracepoints to be made more efficient to use as well
as easier to read in the code.

	Signed-off-by: David Howells <dhowells@redhat.com>
cc: Paulo Alcantara <pc@manguebit.org>
cc: linux-cifs@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
	Signed-off-by: Steve French <stfrench@microsoft.com>
(cherry picked from commit 64c9471)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
@PlaidCat
smb: client: relax session and tcon reconnect attempts
eb933af 
jira KERNEL-710
Rebuild_History Non-Buildable kernel-6.12.0-124.40.1.el10_1
commit-author Paulo Alcantara <pc@manguebit.org>
commit 855982a
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-6.12.0-124.40.1.el10_1/855982a5.failed

When the client re-establishes connection to the server, it will queue
a worker thread that will attempt to reconnect sessions and tcons on
every two seconds, which is kinda overkill as it is a very common
scenario when having expired passwords or KRB5 TGT tickets, or deleted
shares.

Use an exponential backoff strategy to handle session/tcon reconnect
attempts in the worker thread to prevent the client from overloading
the system when it is very unlikely to re-establish any session/tcon
soon while client is idle.

	Signed-off-by: Paulo Alcantara (Red Hat) <pc@manguebit.org>
	Reviewed-by: David Howells <dhowells@redhat.com>
	Cc: Pierguido Lambri <plambri@redhat.com>
	Cc: linux-cifs@vger.kernel.org
	Signed-off-by: Steve French <stfrench@microsoft.com>
(cherry picked from commit 855982a)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>

# Conflicts:
#	fs/smb/client/cifsglob.h
@PlaidCat
smb: client: improve error message when creating SMB session
26bd48d 
jira KERNEL-710
Rebuild_History Non-Buildable kernel-6.12.0-124.40.1.el10_1
commit-author Paulo Alcantara <pc@manguebit.org>
commit a8fce7c

When failing to create a new SMB session with 'sec=krb5' for example,
the following error message isn't very useful

	CIFS: VFS: \\srv Send error in SessSetup = -126

Improve it by printing the following instead on dmesg

	CIFS: VFS: \\srv failed to create a new SMB session with Kerberos: -126

	Signed-off-by: Paulo Alcantara (Red Hat) <pc@manguebit.org>
	Cc: Pierguido Lambri <plambri@redhat.com>
	Reviewed-by: David Howells <dhowells@redhat.com>
	Cc: linux-cifs@vger.kernel.org
	Signed-off-by: Steve French <stfrench@microsoft.com>
(cherry picked from commit a8fce7c)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
@PlaidCat
smb: client: Add tracepoint for krb5 auth
1eb0aa0 
jira KERNEL-710
Rebuild_History Non-Buildable kernel-6.12.0-124.40.1.el10_1
commit-author Paulo Alcantara <pc@manguebit.org>
commit 7ad7859
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-6.12.0-124.40.1.el10_1/7ad78592.failed

Add tracepoint to help debugging krb5 auth failures.

Example:

$ trace-cmd record -e smb3_kerberos_auth
$ mount.cifs ...
$ trace-cmd report
mount.cifs-1667 [003] .....  5810.668549: smb3_kerberos_auth: vers=2
host=w22-dc1.zelda.test ip=192.168.124.30:445 sec=krb5 uid=0 cruid=0
user=root pid=1667 upcall_target=app err=-126

	Signed-off-by: Paulo Alcantara (Red Hat) <pc@manguebit.org>
	Reviewed-by: David Howells <dhowells@redhat.com>
	Cc: Pierguido Lambri <plambri@redhat.com>
	Cc: linux-cifs@vger.kernel.org
	Signed-off-by: Steve French <stfrench@microsoft.com>
(cherry picked from commit 7ad7859)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>

# Conflicts:
#	fs/smb/client/cifs_spnego.c
@PlaidCat
scsi: s390: zfcp: Ensure synchronous unit_add
6884570 
jira KERNEL-710
Rebuild_History Non-Buildable kernel-6.12.0-124.40.1.el10_1
commit-author Peter Oberparleiter <oberpar@linux.ibm.com>
commit 9697ca0

Improve the usability of the unit_add sysfs attribute by ensuring that
the associated FCP LUN scan processing is completed synchronously.  This
enables configuration tooling to consistently determine the end of the
scan process to allow for serialization of follow-on actions.

While the scan process associated with unit_add typically completes
synchronously, it is deferred to an asynchronous background process if
unit_add is used before initial remote port scanning has completed.  This
occurs when unit_add is used immediately after setting the associated FCP
device online.

To ensure synchronous unit_add processing, wait for remote port scanning
to complete before initiating the FCP LUN scan.

	Cc: stable@vger.kernel.org
	Reviewed-by: M Nikhil <nikh1092@linux.ibm.com>
	Reviewed-by: Nihar Panda <niharp@linux.ibm.com>
	Signed-off-by: Peter Oberparleiter <oberpar@linux.ibm.com>
	Signed-off-by: Nihar Panda <niharp@linux.ibm.com>
Link: https://lore.kernel.org/r/20250603182252.2287285-2-niharp@linux.ibm.com
	Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 9697ca0)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
@PlaidCat
net/smc: Remove validation of reserved bits in CLC Decline message
53abac6 
jira KERNEL-710
Rebuild_History Non-Buildable kernel-6.12.0-124.40.1.el10_1
commit-author Mahanta Jambigi <mjambigi@linux.ibm.com>
commit cc282f7

Currently SMC code is validating the reserved bits while parsing the incoming
CLC decline message & when this validation fails, its treated as a protocol
error. As a result, the SMC connection is terminated instead of falling back to
TCP. As per RFC7609[1] specs we shouldn't be validating the reserved bits that
is part of CLC message. This patch fixes this issue.

CLC Decline message format can viewed here[2].

[1] https://datatracker.ietf.org/doc/html/rfc7609#page-92
[2] https://datatracker.ietf.org/doc/html/rfc7609#page-105

Fixes: 8ade200 ("net/smc: add v2 format of CLC decline message")
	Signed-off-by: Mahanta Jambigi <mjambigi@linux.ibm.com>
	Reviewed-by: Sidraya Jayagond <sidraya@linux.ibm.com>
	Reviewed-by: Alexandra Winter <wintera@linux.ibm.com>
	Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
Link: https://patch.msgid.link/20250902082041.98996-1-mjambigi@linux.ibm.com
	Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit cc282f7)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
@PlaidCat
netlink: specs: fou: replace underscores with dashes in names
d79582c 
jira KERNEL-710
Rebuild_History Non-Buildable kernel-6.12.0-124.40.1.el10_1
commit-author Jakub Kicinski <kuba@kernel.org>
commit 791a9ed

We're trying to add a strict regexp for the name format in the spec.
Underscores will not be allowed, dashes should be used instead.
This makes no difference to C (codegen, if used, replaces special
chars in names) but it gives more uniform naming in Python.

Fixes: 4eb77b4 ("netlink: add a proto specification for FOU")
	Reviewed-by: Donald Hunter <donald.hunter@gmail.com>
Link: https://patch.msgid.link/20250624211002.3475021-3-kuba@kernel.org
	Signed-off-by: Jakub Kicinski <kuba@kernel.org>
(cherry picked from commit 791a9ed)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>
@PlaidCat
s390/mm: Fix __ptep_rdp() inline assembly
1dbb880 
jira KERNEL-710
Rebuild_History Non-Buildable kernel-6.12.0-124.40.1.el10_1
commit-author Heiko Carstens <hca@linux.ibm.com>
commit 31475b8
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-6.12.0-124.40.1.el10_1/31475b88.failed

When a zero ASCE is passed to the __ptep_rdp() inline assembly, the
generated instruction should have the R3 field of the instruction set to
zero. However the inline assembly is written incorrectly: for such cases a
zero is loaded into a register allocated by the compiler and this register
is then used by the instruction.

This means that selected TLB entries may not be flushed since the specified
ASCE does not match the one which was used when the selected TLB entries
were created.

Fix this by removing the asce and opt parameters of __ptep_rdp(), since
all callers always pass zero, and use a hard-coded register zero for
the R3 field.

Fixes: 0807b85 ("s390/mm: add support for RDP (Reset DAT-Protection)")
	Cc: stable@vger.kernel.org
	Reviewed-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
	Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
(cherry picked from commit 31475b8)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>

# Conflicts:
#	arch/s390/include/asm/pgtable.h
@PlaidCat
Rebuild rocky10_1 with kernel-6.12.0-124.40.1.el10_1
16ddd08 
Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v6.12~1..kernel-mainline: 93416
Number of commits in rpm: 17
Number of commits matched with upstream: 8 (47.06%)
Number of commits in upstream but not in rpm: 93408
Number of commits NOT found in upstream: 9 (52.94%)

Rebuilding Kernel on Branch rocky10_1_rebuild_kernel-6.12.0-124.40.1.el10_1 for kernel-6.12.0-124.40.1.el10_1
Clean Cherry Picks: 5 (62.50%)
Empty Cherry Picks: 3 (37.50%)
_______________________________

Full Details Located here:
ciq/ciq_backports/kernel-6.12.0-124.40.1.el10_1/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
@PlaidCat PlaidCat self-assigned this Mar 3, 2026
@PlaidCat PlaidCat requested review from a team March 3, 2026 15:53
jdieter
jdieter approved these changes Mar 3, 2026
View reviewed changes
Copy link

@jdieter jdieter left a comment

Choose a reason for hiding this comment

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

🚢

bmastbergen
bmastbergen approved these changes Mar 3, 2026
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.

🥌

@PlaidCat PlaidCat merged commit 16ddd08 into rocky10_1 Mar 3, 2026
4 checks passed
@PlaidCat PlaidCat deleted the rocky10_1_rebuild branch March 3, 2026 19:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jdieter jdieter jdieter approved these changes

@bmastbergen bmastbergen bmastbergen approved these changes

Assignees

@PlaidCat PlaidCat

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@PlaidCat @jdieter @bmastbergen