Rebuild rocky9_4 with kernel-5.14.0-427.40.1.el9_4

Rebuild_History BUILDABLERebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v5.14~1..master: 244733
Number of commits in rpm: 48
Number of commits matched with upstream: 43 (89.58%)
Number of commits in upstream but not in rpm: 244690
Number of commits NOT found in upstream: 5 (10.42%)

Rebuilding Kernel on Branch rocky9_4_rebuild_kernel-5.14.0-427.40.1.el9_4 for kernel-5.14.0-427.40.1.el9_4
Clean Cherry Picks: 36 (83.72%)
Empty Cherry Picks: 7 (16.28%)
_______________________________

Full Details Located here:
ciq/ciq_backports/kernel-5.14.0-427.40.1.el9_4/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

Author: PlaidCat

COPYING-5.14.0-427.37.1.el9_4 renamed to COPYING-5.14.0-427.40.1.el9_4

@@ -12,7 +12,7 @@ RHEL_MINOR = 4
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 427.37.1
+RHEL_RELEASE = 427.40.1
 
 #
 # ZSTREAM

Makefile.rhelver

@@ -33,7 +33,7 @@ EXPORT_SYMBOL_GPL(entry_ibpb);
 
 .align L1_CACHE_BYTES, 0xcc
 SYM_CODE_START_NOALIGN(mds_verw_sel)
-	UNWIND_HINT_UNDEFINED
+	UNWIND_HINT_EMPTY
 	ANNOTATE_NOENDBR
 	.word __KERNEL_DS
 .align L1_CACHE_BYTES, 0xcc

arch/x86/entry/entry.S

@@ -307,7 +307,7 @@
  * Note: Only the memory operand variant of VERW clears the CPU buffers.
  */
 .macro CLEAR_CPU_BUFFERS
-	ALTERNATIVE "", __stringify(verw _ASM_RIP(mds_verw_sel)), X86_FEATURE_CLEAR_CPU_BUF
+	ALTERNATIVE __stringify(verw _ASM_RIP(mds_verw_sel)), "", ALT_NOT(X86_FEATURE_CLEAR_CPU_BUF)
 .endm
 
 #else /* __ASSEMBLY__ */

arch/x86/include/asm/nospec-branch.h

@@ -28,34 +28,33 @@ JGsGjonO3kGdFMd1Wy7e52A9aOP44qEHOb7/B6MD+RzAyvbUBpYPQENTQlE/vmeG
 4u/bjR9073kgoFFFNp3OL08KGIfUtlGj4xdhPDi+pu13JaiDzd7ZmYrE+ktZ
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIFEzCCA/ugAwIBAgIBKzANBgkqhkiG9w0BAQsFADCB1DELMAkGA1UEBhMCVVMx
+MIIFCTCCA/GgAwIBAgIBJjANBgkqhkiG9w0BAQsFADCB1DELMAkGA1UEBhMCVVMx
 ETAPBgNVBAgMCERlbGF3YXJlMQ4wDAYDVQQHDAVEb3ZlcjEtMCsGA1UECgwkUm9j
 a3kgRW50ZXJwcmlzZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMSEwHwYDVQQLDBhSZWxl
 YXNlIGVuZ2luZWVyaW5nIHRlYW0xKDAmBgNVBAMMH1JvY2t5IExpbnV4IFNlY3Vy
 ZSBCb290IFJvb3QgQ0ExJjAkBgkqhkiG9w0BCQEWF3NlY3VyaXR5QHJvY2t5bGlu
-dXgub3JnMB4XDTI0MDQwNDAwMzM0OVoXDTI1MDQwNDAwMzM0OVowgeIxCzAJBgNV
+dXgub3JnMB4XDTI0MDQwNDAwMzM0OVoXDTI1MDQwNDAwMzM0OVowgdgxCzAJBgNV
 BAYTAlVTMREwDwYDVQQIDAhEZWxhd2FyZTEOMAwGA1UEBwwFRG92ZXIxLTArBgNV
 BAoMJFJvY2t5IEVudGVycHJpc2UgU29mdHdhcmUgRm91bmRhdGlvbjEhMB8GA1UE
-CwwYUmVsZWFzZSBlbmdpbmVlcmluZyB0ZWFtMTYwNAYDVQQDDC1Sb2NreSBMaW51
-eCBEcml2ZXIgU2lnbmluZyBDZXJ0IDEwMSAoYWFyY2g2NCkxJjAkBgkqhkiG9w0B
-CQEWF3NlY3VyaXR5QHJvY2t5bGludXgub3JnMIIBojANBgkqhkiG9w0BAQEFAAOC
-AY8AMIIBigKCAYEA4ZtE5e2MHA3ti/HD7tg09lPovHWY7kDNp1ZHKgLxG0WUziV+
-bxxYoQqBLNTdfObDNIsBLZpYQpgRajLEOUkxLhzJHaY726L7X84Y5ZnsT0VIepFu
-VygHfQOSBiNaN7ven7euhX8d9HVoGG4AkHq8IfIFXVrwQcok23ej4Y1qltuz2PbP
-1PQM5/jgY5DolkuPeFS41RO4gTTZde9Du1IkCeXr7QRPxuXfa/Z9XZHUqow3+bbT
-35Rf5KvHYubykGFAms5+qyUjj9WyK7dICjM2UYipn/s9hZ7LUvjF/msBa3DeSa3X
-VOvpan0yITa4Ij6LadEkNYs/uNVS7XPDEqD+grjb4aEoLch/r4gYxDPVlEVEqMI6
-eSaQjcsRbMAAxDeAF4YshemwsBcO4ASF3DdhClHVuJIjJnxyhQb4SnSn6rd38v9M
-JLmk60UiECgpZO+yOv7ygwsGfY51TQYgh+gCMwNjpitY4WUJo0yvV/1at0eS0pRm
-9RPVGyciZ9J8JsoDAgMBAAGjYDBeMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQD
-AgeAMB0GA1UdDgQWBBQnBJ+YZ0TMPWpynQhP6hiaikFirjAfBgNVHSMEGDAWgBRM
-LGvX1k7oFYHKuOmGZh9l4hZvxDANBgkqhkiG9w0BAQsFAAOCAQEAo/xALadsig6A
-TzKL+5sOvnIpJ/Ma4lr+jXUrc7P2S0R5wCHdKH0MmtZ06ALlzZkJNtvR3o+oPRPn
-E3ME2sUbIKB8NgqVHhn/6IIKcI1Jj6zzV/7locNBTL+XhTDebk+wz6xUlSr2CV4t
-l0WOZ/whMDAgtN+DYOyMQJaiNUbg3u+zcJ+ZACTDmlMTir7GTN+AxfgfzavUDL9B
-5Yrs5+AAy5OxHdDaUNfm43ZQGKGUfFuUmjabZ51NsqXtBXhcHE6m7ZwLvDYtBehH
-Q/7CEGHaaeD5pC+phy4j6E5l3clJr+dxZrtgewO9plk73SHL+ypFeR3S2qPY5GmN
-u5DDznL0Og==
+CwwYUmVsZWFzZSBlbmdpbmVlcmluZyB0ZWFtMSwwKgYDVQQDDCNSb2NreSBMaW51
+eCBLcGF0Y2ggU2lnbmluZyBDZXJ0IDEwMTEmMCQGCSqGSIb3DQEJARYXc2VjdXJp
+dHlAcm9ja3lsaW51eC5vcmcwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIB
+gQC/k4GyJKctyXNB51dU3TTQ28S7j+OimjM4LmA3qQVNq4go/+DWnbT9NpRb248h
+T6Dl5HIQ9yKNdt9zPD6fjZG+V8lRpdLnpGUFMWfjyMlGx1JTjtRzZ0QquO8P3gl3
+JMfLj0uKH+pGXV7QSFA3YiczG2A1jwf2qfDUjQJw87xFT+DYI2GWKrQqOyLnwRRl
+OeyJkvDOyqh/RVOsVX42bamzmATRCOmixzRGrk3+Ksv/0FV/eVUoqd8yib2AGlMf
+vMqPBRbrIURbHO4/wgcjhcNl4JioGk2V5FLVwG83dLOfwkJd2zp6I8dR8m1shEbj
+3zxtqc59JpW7WWhqXbwqCvFSQijVdkui/xyPCCr6o0b9zQWRaBArYbSxds48dgO5
+ZVHvTTCfSTPYYhtepZYMINuaWIbX3DD3wMOEK2kmNU5Qjg459RDZMb0Rl/PhbGuS
+F/GbkOVQhllENKjAxsGFi+IfApB2Dvz+EyWouvQlKDRBw5G0KHqauy/aWkeWeRzp
+n3kCAwEAAaNgMF4wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0O
+BBYEFLXuB8c35X7L6u1JOlE3l2OwYxLFMB8GA1UdIwQYMBaAFEwsa9fWTugVgcq4
+6YZmH2XiFm/EMA0GCSqGSIb3DQEBCwUAA4IBAQAAnyGNChwn8gs0srrl/F8h0yJO
+2SAcb+wMq0TypF0TuTCFWZL6ICCQ30HNXi7RSyajF/qa3xspXQv7Klu/uguW5SOz
+DCpx/YDp2VABTQtOWrsJXYmqicmeaNipfIhUJCrS/opPASQv1CQxl7JSSKlJDYtx
+jzE7QG3ptd8xBWj9RsVxpoeoF2qhv1A0VBmb5WUYp5w9S4TGL34U1fWTkEnLk+sy
+vMPYZ0FOYWF8o133kJTcjwXWPjVPW1L4evyTGzguju9eZP3OiCBxbjYwi43p4HlK
+3K8UhkhoCsIWT6Ucj3OFcZ3MUQXGxOa8BZEV4TdyPUFvtahlOIgfqMbxK12g
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEfjCCA2agAwIBAgIUWOH3GRgYTJQQwhxTTgTX3PHww9UwDQYJKoZIhvcNAQEL

certs/rhel.pem

@@ -0,0 +1,27 @@
+Rebuild_History BUILDABLERebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
+Number of commits in upstream range v5.14~1..master: 244733
+Number of commits in rpm: 48
+Number of commits matched with upstream: 43 (89.58%)
+Number of commits in upstream but not in rpm: 244690
+Number of commits NOT found in upstream: 5 (10.42%)
+
+Rebuilding Kernel on Branch rocky9_4_rebuild_kernel-5.14.0-427.40.1.el9_4 for kernel-5.14.0-427.40.1.el9_4
+Clean Cherry Picks: 36 (83.72%)
+Empty Cherry Picks: 7 (16.28%)
+_______________________________
+
+__EMPTY COMMITS__________________________
+a2db328b0839312c169eb42746ec46fc1ab53ed2 null_blk: fix null-ptr-dereference while configuring 'power' and 'submit_queues'
+85e6f61c134f111232d27d3f63667c1bccbbc12d module: move early sanity checks into a helper
+064f4536d13939b6e8cdb71298ff5d657f4f8caa module: avoid allocation if module is already present and ready
+8deeefb24786ea7950b37bde4516b286c877db00 Revert "net/mlx5: Block entering switchdev mode with ns inconsistency"
+485d65e1357123a697c591a5aeb773994b247ad7 net/mlx5: Add a timeout to acquire the command queue semaphore
+e1a7ac6f3ba6e157adcd0ca94d92a401f1943f56 ping: fix address binding wrt vrf
+35264909e9d1973ab9aaa2a1b07cda70f12bb828 gfs2: Fix NULL pointer dereference in gfs2_log_flush
+
+__CHANGES NOT IN UPSTREAM________________
+Porting to 9.4, debranding and Rocky branding'
+Ensure aarch64 kernel is not compressed'
+x86/bugs: Reverse instruction order of CLEAR_CPU_BUFFERS
+redhat/configs: Enable x86 CONFIG_MITIGATION_RFDS
+net: psample: fix uninitialized metadata.

ciq/ciq_backports/kernel-5.14.0-427.40.1.el9_4/rebuild.details.txt

@@ -3230,6 +3230,7 @@ CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
+CONFIG_MITIGATION_RFDS=y
 # CONFIG_MK8 is not set
 # CONFIG_MLX4_CORE_GEN2 is not set
 CONFIG_MLX4_EN_DCB=y

configs/kernel-x86_64-debug-rhel.config

@@ -3210,6 +3210,7 @@ CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
+CONFIG_MITIGATION_RFDS=y
 # CONFIG_MK8 is not set
 # CONFIG_MLX4_CORE_GEN2 is not set
 CONFIG_MLX4_EN_DCB=y

configs/kernel-x86_64-rhel.config

@@ -3287,6 +3287,7 @@ CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
+CONFIG_MITIGATION_RFDS=y
 # CONFIG_MK8 is not set
 # CONFIG_MLX4_CORE_GEN2 is not set
 CONFIG_MLX4_DEBUG=y

configs/kernel-x86_64-rt-debug-rhel.config

@@ -3267,6 +3267,7 @@ CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MISC_RTSX_PCI=m
 CONFIG_MISC_RTSX_USB=m
+CONFIG_MITIGATION_RFDS=y
 # CONFIG_MK8 is not set
 # CONFIG_MLX4_CORE_GEN2 is not set
 CONFIG_MLX4_DEBUG=y