From 11b799d56c0e0fc9f9b28e2a2b07da215632a7f9 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 29 Aug 2024 15:17:34 -0600 Subject: [PATCH 1/2] kernel-6.11.0-0.rc5.20240829gitd5d547aa7b51.46 * Thu Aug 29 2024 Fedora Kernel Team [6.11.0-0.rc5.d5d547aa7b51.46] - redhat/configs: Microchip lan743x driver (Izabela Bakollari) - Linux v6.11.0-0.rc5.d5d547aa7b51 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 6 ++++ kernel-aarch64-64k-debug-rhel.config | 7 +++- kernel-aarch64-64k-rhel.config | 7 +++- kernel-aarch64-debug-rhel.config | 7 +++- kernel-aarch64-rhel.config | 7 +++- kernel-aarch64-rt-debug-rhel.config | 7 +++- kernel-aarch64-rt-rhel.config | 7 +++- kernel-ppc64le-debug-rhel.config | 7 +++- kernel-ppc64le-rhel.config | 7 +++- kernel-s390x-debug-rhel.config | 7 +++- kernel-s390x-rhel.config | 7 +++- kernel-s390x-zfcpdump-rhel.config | 9 +++-- kernel-x86_64-debug-rhel.config | 7 +++- kernel-x86_64-rhel.config | 7 +++- kernel-x86_64-rt-debug-rhel.config | 7 +++- kernel-x86_64-rt-rhel.config | 7 +++- kernel.changelog | 12 +++++++ kernel.spec | 37 ++++++++++++++++---- patch-6.11-redhat.patch | 50 +++++++++++++++++++++++++--- sources | 6 ++-- 21 files changed, 189 insertions(+), 31 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index e266cc0cd..6645cf390 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 44 +RHEL_RELEASE = 46 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index e8c0861c0..8a6548b6e 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,9 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/3c3fe7f3d440e344ba33049fa99d14eb6172224b + 3c3fe7f3d440e344ba33049fa99d14eb6172224b redhat: include resolve_btfids in kernel-devel + +https://gitlab.com/cki-project/kernel-ark/-/commit/8b553d8591d86f4a768f3b55f99f8480872cb823 + 8b553d8591d86f4a768f3b55f99f8480872cb823 redhat: workaround CKI cross compilation for scripts + https://gitlab.com/cki-project/kernel-ark/-/commit/b0c8e7622950ce4bd430980be9a93e56bda43672 b0c8e7622950ce4bd430980be9a93e56bda43672 crypto: akcipher - Disable signing and decryption diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index e7c30e7eb..69693cbbe 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -1953,8 +1953,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set CONFIG_ENA_ETHERNET=m +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -3334,7 +3336,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set CONFIG_LATENCYTOP=y # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -4370,7 +4374,7 @@ CONFIG_NET_VENDOR_MARVELL=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y @@ -7768,6 +7772,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_MEM2MEM_DRIVERS is not set # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index e3d9adab2..d9f11a6d9 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -1945,8 +1945,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set CONFIG_ENA_ETHERNET=m +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -3313,7 +3315,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set # CONFIG_LATENCYTOP is not set # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -4349,7 +4353,7 @@ CONFIG_NET_VENDOR_MARVELL=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y @@ -7743,6 +7747,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_MEM2MEM_DRIVERS is not set # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index a5c83268c..2ec5192fb 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1951,8 +1951,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set CONFIG_ENA_ETHERNET=m +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -3331,7 +3333,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set CONFIG_LATENCYTOP=y # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -4367,7 +4371,7 @@ CONFIG_NET_VENDOR_MARVELL=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y @@ -7764,6 +7768,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_MEM2MEM_DRIVERS is not set # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index cb33a6578..51f61412f 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1943,8 +1943,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set CONFIG_ENA_ETHERNET=m +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -3310,7 +3312,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set # CONFIG_LATENCYTOP is not set # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -4346,7 +4350,7 @@ CONFIG_NET_VENDOR_MARVELL=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y @@ -7739,6 +7743,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_MEM2MEM_DRIVERS is not set # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 4765f7809..b4fd1fd45 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -1989,8 +1989,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set CONFIG_ENA_ETHERNET=m +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -3371,7 +3373,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set CONFIG_LATENCYTOP=y # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -4407,7 +4411,7 @@ CONFIG_NET_VENDOR_MARVELL=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y @@ -7813,6 +7817,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_MEM2MEM_DRIVERS is not set # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 52b7cbc8f..de6ba8c49 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -1981,8 +1981,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set CONFIG_ENA_ETHERNET=m +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -3350,7 +3352,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set # CONFIG_LATENCYTOP is not set # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -4386,7 +4390,7 @@ CONFIG_NET_VENDOR_MARVELL=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y @@ -7788,6 +7792,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_MEM2MEM_DRIVERS is not set # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 0a962b55b..f3b40b3b1 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1705,8 +1705,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -3012,7 +3014,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set CONFIG_LATENCYTOP=y # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -4014,7 +4018,7 @@ CONFIG_NET_VENDOR_MARVELL=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y @@ -7227,6 +7231,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_MEM2MEM_DRIVERS is not set # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 1c2552e61..b08420be5 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1697,8 +1697,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -2992,7 +2994,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set # CONFIG_LATENCYTOP is not set # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -3994,7 +3998,7 @@ CONFIG_NET_VENDOR_MARVELL=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y @@ -7204,6 +7208,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_MEM2MEM_DRIVERS is not set # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index ca50a4c19..0c5cf8d0a 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1706,8 +1706,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -2988,7 +2990,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set CONFIG_LATENCYTOP=y # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -3993,7 +3997,7 @@ CONFIG_NET_VENDOR_GOOGLE=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y # CONFIG_NET_VENDOR_MYRI is not set @@ -7203,6 +7207,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_MEM2MEM_DRIVERS is not set # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index f94a92cf9..2446dffaf 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1698,8 +1698,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -2968,7 +2970,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set # CONFIG_LATENCYTOP is not set # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -3973,7 +3977,7 @@ CONFIG_NET_VENDOR_GOOGLE=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y # CONFIG_NET_VENDOR_MYRI is not set @@ -7180,6 +7184,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_MEM2MEM_DRIVERS is not set # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index e99848246..76fe9cb1f 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1699,8 +1699,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=y CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -2976,7 +2978,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set # CONFIG_LATENCYTOP is not set # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -3983,7 +3987,7 @@ CONFIG_NET_VENDOR_GOOGLE=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y # CONFIG_NET_VENDOR_MYRI is not set @@ -5102,7 +5106,7 @@ CONFIG_RXKAD=y CONFIG_RXPERF=m # CONFIG_S390_GUEST is not set # CONFIG_S390_HYPFS_FS is not set -CONFIG_S390_HYPFS=y +# CONFIG_S390_HYPFS is not set # CONFIG_S390_KPROBES_SANITY_TEST is not set # CONFIG_S390_MODULES_SANITY_TEST is not set CONFIG_S390_PRNG=y @@ -7202,6 +7206,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_MEM2MEM_DRIVERS is not set # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 038205fcf..149dc412f 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1838,8 +1838,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set CONFIG_ENA_ETHERNET=m +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -3204,7 +3206,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set CONFIG_LATENCYTOP=y # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -4230,7 +4234,7 @@ CONFIG_NET_VENDOR_MARVELL=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y @@ -7511,6 +7515,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set # CONFIG_VBOXGUEST is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 1098fd433..b307e82b9 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1830,8 +1830,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set CONFIG_ENA_ETHERNET=m +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -3184,7 +3186,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set # CONFIG_LATENCYTOP is not set # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -4210,7 +4214,7 @@ CONFIG_NET_VENDOR_MARVELL=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y @@ -7487,6 +7491,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set # CONFIG_VBOXGUEST is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index c320ec322..13fb8521f 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -1876,8 +1876,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set CONFIG_ENA_ETHERNET=m +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -3244,7 +3246,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set CONFIG_LATENCYTOP=y # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -4270,7 +4274,7 @@ CONFIG_NET_VENDOR_MARVELL=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y @@ -7560,6 +7564,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set # CONFIG_VBOXGUEST is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 2b6528506..34660bbf4 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -1868,8 +1868,10 @@ CONFIG_EFI_ZBOOT=y CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set CONFIG_ENA_ETHERNET=m +# CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENCX24J600 is not set CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m # CONFIG_ENS160 is not set @@ -3224,7 +3226,9 @@ CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m CONFIG_L2TP=m CONFIG_L2TP_V3=y +CONFIG_LAN743X=m # CONFIG_LAN966X_OIC is not set +# CONFIG_LAN966X_SWITCH is not set # CONFIG_LAPB is not set # CONFIG_LATENCYTOP is not set # CONFIG_LATTICE_ECP3_CONFIG is not set @@ -4250,7 +4254,7 @@ CONFIG_NET_VENDOR_MARVELL=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_META=y # CONFIG_NET_VENDOR_MICREL is not set -# CONFIG_NET_VENDOR_MICROCHIP is not set +CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_NET_VENDOR_MICROSEMI is not set CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y @@ -7536,6 +7540,7 @@ CONFIG_UV_SYSFS=m # CONFIG_V4L_PLATFORM_DRIVERS is not set # CONFIG_VALIDATE_FS_PARSER is not set # CONFIG_VBOXGUEST is not set +# CONFIG_VCAP is not set # CONFIG_VCNL3020 is not set # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set diff --git a/kernel.changelog b/kernel.changelog index a181b762f..a1a32d988 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,15 @@ +* Thu Aug 29 2024 Fedora Kernel Team [6.11.0-0.rc5.d5d547aa7b51.46] +- redhat/configs: Microchip lan743x driver (Izabela Bakollari) +- Linux v6.11.0-0.rc5.d5d547aa7b51 +Resolves: + +* Wed Aug 28 2024 Fedora Kernel Team [6.11.0-0.rc5.86987d84b968.45] +- redhat: include resolve_btfids in kernel-devel (Jan Stancek) +- redhat: workaround CKI cross compilation for scripts (Jan Stancek) +- spec: fix "unexpected argument to non-parametric macro" warnings (Jan Stancek) +- Linux v6.11.0-0.rc5.86987d84b968 +Resolves: RHEL-56069 + * Tue Aug 27 2024 Fedora Kernel Team [6.11.0-0.rc5.3e9bff3bbe13.44] - Linux v6.11.0-0.rc5.3e9bff3bbe13 Resolves: RHEL-49398 diff --git a/kernel.spec b/kernel.spec index 46f00cd82..ad44e21e4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ # Replace '-' with '_' where needed so that variants can use '-' in # their name. -%define uname_suffix %{lua: +%define uname_suffix() %{lua: local flavour = rpm.expand('%{?1:+%{1}}') flavour = flavour:gsub('-', '_') if flavour ~= '' then @@ -69,7 +69,7 @@ # string. However, kernel-64k-debug is the debug version of kernel-64k, # in this case we need to return "64k", and so on. This is used in # macros below where we need this for some uname based requires. -%define uname_variant %{lua: +%define uname_variant() %{lua: local flavour = rpm.expand('%{?1:%{1}}') _, _, main, sub = flavour:find("(%w+)-(.*)") if main then @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc5.20240827git3e9bff3bbe13.44 +%define pkgrelease 0.rc5.20240829gitd5d547aa7b51.46 %define kversion 6 -%define tarfile_release 6.11-rc5-15-g3e9bff3bbe13 +%define tarfile_release 6.11-rc5-81-gd5d547aa7b51 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20240827git3e9bff3bbe13.44%{?buildid}%{?dist} +%define specrelease 0.rc5.20240829gitd5d547aa7b51.46%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -2430,12 +2430,12 @@ BuildKernel() { cp --parents tools/build/Build $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp --parents tools/build/fixdep.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp --parents tools/objtool/sync-check.sh $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - cp -a --parents tools/bpf/resolve_btfids/main.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - cp -a --parents tools/bpf/resolve_btfids/Build $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + cp -a --parents tools/bpf/resolve_btfids $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp --parents security/selinux/include/policycap_names.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp --parents security/selinux/include/policycap.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + cp -a --parents tools/include/asm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp -a --parents tools/include/asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp -a --parents tools/include/linux $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp -a --parents tools/include/uapi/asm $RPM_BUILD_ROOT/lib/modules/$KernelVer/build @@ -2473,6 +2473,9 @@ BuildKernel() { if [ -d arch/%{asmarch}/include ]; then cp -a --parents arch/%{asmarch}/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ fi + if [ -d tools/arch/%{asmarch}/include ]; then + cp -a --parents tools/arch/%{asmarch}/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + fi %ifarch aarch64 # arch/arm64/include/asm/xen references arch/arm cp -a --parents arch/arm/include/asm/xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ @@ -2803,6 +2806,12 @@ BuildKernel() { %{log_msg "Remove depmod files"} remove_depmod_files +%if %{with_cross} + make -C $RPM_BUILD_ROOT/lib/modules/$KernelVer/build M=scripts clean + make -C $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/bpf/resolve_btfids clean + sed -i 's/REBUILD_SCRIPTS_FOR_CROSS:=0/REBUILD_SCRIPTS_FOR_CROSS:=1/' $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile +%endif + # Move the devel headers out of the root file system %{log_msg "Move the devel headers to RPM_BUILD_ROOT"} mkdir -p $RPM_BUILD_ROOT/usr/src/kernels @@ -3495,6 +3504,10 @@ then\ /usr/bin/find /usr/src/kernels -type f -name '*.hardlink-temporary' -delete\ )\ fi\ +%if %{with_cross}\ + echo "Building scripts and resolve_btfids"\ + env --unset=ARCH make -C /usr/src/kernels/%{KVERREL}%{?1:+%{1}} prepare_after_cross\ +%endif\ %{nil} # @@ -4098,6 +4111,16 @@ fi\ # # %changelog +* Thu Aug 29 2024 Fedora Kernel Team [6.11.0-0.rc5.d5d547aa7b51.46] +- redhat/configs: Microchip lan743x driver (Izabela Bakollari) +- Linux v6.11.0-0.rc5.d5d547aa7b51 + +* Wed Aug 28 2024 Fedora Kernel Team [6.11.0-0.rc5.86987d84b968.45] +- redhat: include resolve_btfids in kernel-devel (Jan Stancek) +- redhat: workaround CKI cross compilation for scripts (Jan Stancek) +- spec: fix "unexpected argument to non-parametric macro" warnings (Jan Stancek) +- Linux v6.11.0-0.rc5.86987d84b968 + * Tue Aug 27 2024 Fedora Kernel Team [6.11.0-0.rc5.3e9bff3bbe13.44] - Linux v6.11.0-0.rc5.3e9bff3bbe13 diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index 92f63e173..907d86d63 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -2,7 +2,7 @@ Documentation/admin-guide/rh-waived-features.rst | 21 + Kconfig | 2 + Kconfig.redhat | 26 + - Makefile | 20 +- + Makefile | 48 +- arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 2 +- arch/s390/include/asm/ipl.h | 1 + @@ -83,7 +83,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 85 files changed, 2734 insertions(+), 266 deletions(-) + 85 files changed, 2762 insertions(+), 266 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 09126bb8cc9f..ee2984e46c06 100644 @@ -193,7 +193,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index 7b60eb103c5d..a571f56cedd7 100644 +index 7b60eb103c5d..29f32b29bca6 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -215,7 +215,25 @@ index 7b60eb103c5d..a571f56cedd7 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -1241,7 +1253,13 @@ define filechk_version.h +@@ -333,6 +345,17 @@ ifneq ($(filter install,$(MAKECMDGOALS)),) + endif + endif + ++# CKI/cross compilation hack ++# Do we need to rebuild scripts after cross compilation? ++# If kernel was cross-compiled, these scripts have arch of build host. ++REBUILD_SCRIPTS_FOR_CROSS:=0 ++ ++# Regenerating config with incomplete source tree will produce different ++# config options. Disable it. ++ifeq ($(REBUILD_SCRIPTS_FOR_CROSS),1) ++may-sync-config:= ++endif ++ + ifdef mixed-build + # =========================================================================== + # We're called with mixed targets (*config and build targets). +@@ -1241,7 +1264,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -230,6 +248,30 @@ index 7b60eb103c5d..a571f56cedd7 100644 endef $(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0) +@@ -1848,6 +1877,23 @@ endif + + ifdef CONFIG_MODULES + ++scripts_build: ++ $(MAKE) $(build)=scripts/basic ++ $(MAKE) $(build)=scripts/mod ++ $(MAKE) $(build)=scripts scripts/module.lds ++ $(MAKE) $(build)=scripts scripts/unifdef ++ $(MAKE) $(build)=scripts ++ ++prepare_after_cross: ++ # disable STACK_VALIDATION to avoid building objtool ++ sed -i '/^CONFIG_STACK_VALIDATION/d' ./include/config/auto.conf || true ++ # build minimum set of scripts and resolve_btfids to allow building ++ # external modules ++ $(MAKE) KBUILD_EXTMOD="" M="" scripts_build V=1 ++ $(MAKE) -C tools/bpf/resolve_btfids ++ ++PHONY += prepare_after_cross scripts_build ++ + $(MODORDER): $(build-dir) + @: + diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 54b2bb817a7f..0415b853e1af 100644 --- a/arch/arm/Kconfig diff --git a/sources b/sources index 644b6a04f..e063e5e0c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc5-15-g3e9bff3bbe13.tar.xz) = ae746f6c59c27274d79861d16a9cbea3db179eeda2b5979622f91a8e1c49cb8acc5149171d6e9d43878f7b0dc2b418dc8c3b39fa8c076bdb73616ed8dad92832 -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 2c203d38dc30d67f52015828f8754eac49964d3c1996d0b667b87aa7aff20ed2fa5fae19a90b253d488bb54d5f9bd8200ae305879b6b5b9d41acb98fefd8c1f4 -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 115ed2d2d87324b30eb4c078719913a80b3992ba9e3ac9df4711712b3de12a8f46732a468e8a5acd1c86983426d5a09d1df94c5cda27575a08f3622f4d7e5bc9 +SHA512 (linux-6.11-rc5-81-gd5d547aa7b51.tar.xz) = 86d6babf7580daeec8d4bf237eb71dee866f0f03bed8c529a05af393a657e616b2923f96d9ec655fb78061fff7167205cd5541ade5f4fe756035eb5b1fe29a7f +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 22b46b59c4db77a460b7689270bfdc3cba9875e72c0d5f55ae78c3de93cf9b9064c3052a0a122d4ef4cf3348fe15dc91cde24cadabb8db2571f45d39df8e60a4 +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = f8ff6606251d17bbef92a14822cde99ad04303139ac7b4960ec5e0218ae96b0d3ab7d4b7ab5fb5cabd173afb6e76cf4079c8d1b58b466432578a1870d27494df From 4f956b047907e1ead88bc30699e768407f79c935 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 30 Aug 2024 09:08:57 -0600 Subject: [PATCH 2/2] kernel-6.11.0-0.rc5.20240830git20371ba12063.47 * Fri Aug 30 2024 Fedora Kernel Team [6.11.0-0.rc5.20371ba12063.47] - Linux v6.11.0-0.rc5.20371ba12063 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.changelog | 4 ++++ kernel.spec | 9 ++++++--- sources | 6 +++--- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 6645cf390..61c2648c5 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 46 +RHEL_RELEASE = 47 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index a1a32d988..a66af169a 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Fri Aug 30 2024 Fedora Kernel Team [6.11.0-0.rc5.20371ba12063.47] +- Linux v6.11.0-0.rc5.20371ba12063 +Resolves: + * Thu Aug 29 2024 Fedora Kernel Team [6.11.0-0.rc5.d5d547aa7b51.46] - redhat/configs: Microchip lan743x driver (Izabela Bakollari) - Linux v6.11.0-0.rc5.d5d547aa7b51 diff --git a/kernel.spec b/kernel.spec index ad44e21e4..1423e0570 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc5.20240829gitd5d547aa7b51.46 +%define pkgrelease 0.rc5.20240830git20371ba12063.47 %define kversion 6 -%define tarfile_release 6.11-rc5-81-gd5d547aa7b51 +%define tarfile_release 6.11-rc5-176-g20371ba12063 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20240829gitd5d547aa7b51.46%{?buildid}%{?dist} +%define specrelease 0.rc5.20240830git20371ba12063.47%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4111,6 +4111,9 @@ fi\ # # %changelog +* Fri Aug 30 2024 Fedora Kernel Team [6.11.0-0.rc5.20371ba12063.47] +- Linux v6.11.0-0.rc5.20371ba12063 + * Thu Aug 29 2024 Fedora Kernel Team [6.11.0-0.rc5.d5d547aa7b51.46] - redhat/configs: Microchip lan743x driver (Izabela Bakollari) - Linux v6.11.0-0.rc5.d5d547aa7b51 diff --git a/sources b/sources index e063e5e0c..37aff59fe 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc5-81-gd5d547aa7b51.tar.xz) = 86d6babf7580daeec8d4bf237eb71dee866f0f03bed8c529a05af393a657e616b2923f96d9ec655fb78061fff7167205cd5541ade5f4fe756035eb5b1fe29a7f -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 22b46b59c4db77a460b7689270bfdc3cba9875e72c0d5f55ae78c3de93cf9b9064c3052a0a122d4ef4cf3348fe15dc91cde24cadabb8db2571f45d39df8e60a4 -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = f8ff6606251d17bbef92a14822cde99ad04303139ac7b4960ec5e0218ae96b0d3ab7d4b7ab5fb5cabd173afb6e76cf4079c8d1b58b466432578a1870d27494df +SHA512 (linux-6.11-rc5-176-g20371ba12063.tar.xz) = 31ce7e63be69fa87ab9e8b06130ce4ea4f64830433b6950e8571c38e639c39e134d2c48b598d7e3e96e07a8cfe988b9bbd96018a90952917d85cb940e5fe73fc +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 95aa965eb9882cce6aeaec1a2de54ddd36fa0d267080ca926b2e772e305d1ee53a0c8f533dedc80701ccfdd7303012adab7747b4fdc48855b96773fea7f4f82b +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 2765f2a009f2ffb9a7fdb4802465efdce8864d869367fc05048d30a419387045c7dd8919e7d28cd75e154fa116455f669f4cd8fb4f332f32685c4882e09eb3d7