From e2cd9aa6d4699d7ba54977701d5d2248a523b787 Mon Sep 17 00:00:00 2001 From: Augusto Caringi Date: Thu, 20 Apr 2023 19:32:21 -0300 Subject: [PATCH 1/4] kernel-6.2.12-300 * Thu Apr 20 2023 Augusto Caringi [6.2.12-0] - Add bugs fixed by 6.2.12 (Justin M. Forbes) - Use RHJOBS for create-tarball (Don Zickus) - Linux v6.2.12 Resolves: Signed-off-by: Augusto Caringi --- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-ppc64le-rhel.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel-x86_64-rhel.config | 2 +- kernel.spec | 15 ++++++++++----- patch-6.2-redhat.patch | 2 +- sources | 6 +++--- 24 files changed, 35 insertions(+), 30 deletions(-) diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 62b4f3e60..9993c6b1d 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2190,7 +2190,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 8da52ac59..ee77fa98c 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1694,7 +1694,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index da50f9d46..1086b5604 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2182,7 +2182,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index a4dcff81e..64d7dc2a6 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1686,7 +1686,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index e0007c6ea..9f26efb10 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2181,7 +2181,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 8207c0eac..a255cf443 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2174,7 +2174,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index c3917cbda..70b771ed4 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2135,7 +2135,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index ec6fe413d..27d068cae 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2128,7 +2128,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 5a3fe4152..b2d51603b 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1692,7 +1692,7 @@ CONFIG_EFI_SECRET=m CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y CONFIG_EFI_TEST=m -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index bc023f143..3adb1b3f1 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1513,7 +1513,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index e4d078556..b1138d2c3 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1683,7 +1683,7 @@ CONFIG_EFI_SECRET=m CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y CONFIG_EFI_TEST=m -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index f3caaaeb7..954ef4429 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1505,7 +1505,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index ff5b76e5c..48d36f4cc 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1697,7 +1697,7 @@ CONFIG_EFI_SECRET=m CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y CONFIG_EFI_TEST=m -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index e4c762b0f..bbb4bf1a0 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1517,7 +1517,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 7c4f9fdfa..e22a3d6ab 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1688,7 +1688,7 @@ CONFIG_EFI_SECRET=m CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y CONFIG_EFI_TEST=m -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 27e3df5b9..854faec64 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1509,7 +1509,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index c2d5c76e2..ac89a4aba 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1514,7 +1514,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set CONFIG_ELF_CORE=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 6a5c5dbdd..b03bfecdc 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1856,7 +1856,7 @@ CONFIG_EFIVAR_FS=y # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set # CONFIG_EFI_VARS_PSTORE is not set CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 0913e4fa6..3d74efe65 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1619,7 +1619,7 @@ CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 067cab59e..3a3ac3162 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1847,7 +1847,7 @@ CONFIG_EFIVAR_FS=y # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set # CONFIG_EFI_VARS_PSTORE is not set CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index bbb6d7bc1..c825cf389 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1611,7 +1611,7 @@ CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel.spec b/kernel.spec index 6b6c0380b..7094fc168 100755 --- a/kernel.spec +++ b/kernel.spec @@ -148,17 +148,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.11 +%define specversion 6.2.12 %define patchversion 6.2 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.11 +%define tarfile_release 6.2.12 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.11 +%define kabiversion 6.2.12 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -502,8 +502,8 @@ Summary: The Linux kernel %define all_arch_configs kernel-%{version}-aarch64*.config %define asmarch arm64 %define hdrarch arm64 -%define make_target vmlinuz.efi -%define kernel_image arch/arm64/boot/vmlinuz.efi +%define make_target Image.gz +%define kernel_image arch/arm64/boot/Image.gz %endif # Should make listnewconfig fail if there's config options @@ -3346,6 +3346,11 @@ fi # # %changelog +* Thu Apr 20 2023 Augusto Caringi [6.2.12-0] +- Add bugs fixed by 6.2.12 (Justin M. Forbes) +- Use RHJOBS for create-tarball (Don Zickus) +- Linux v6.2.12 + * Thu Apr 13 2023 Augusto Caringi [6.2.11-0] - Linux v6.2.11 diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 217aa22a1..c7028a528 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -123,7 +123,7 @@ index 000000000000..1b2a1baa26f9 + +... diff --git a/Makefile b/Makefile -index 416490daa76a..f65904d89130 100644 +index 068374cc2601..ae60a40c82ec 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 9a878391d..dd8b0b42f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2.11.tar.xz) = 282307954ae9555d9beb2f8d5d5abad5813064725311290e82082520998766cff7f993113c4f02fa34f5aafa9edc7985186a548bc1de24e54209989ce842af81 -SHA512 (kernel-abi-stablelists-6.2.11.tar.bz2) = 19687f8a545865e906c1ef2a10636dc6d74db893ba47e9265cbcdf122540c691adc5f556d3d2299ce2f5fe48d0e7f710fe3d7535c87cb24282d1a6793dcf5663 -SHA512 (kernel-kabi-dw-6.2.11.tar.bz2) = 7ffe7a54956c8723b997478027c55352592fb5ec3ccbba016d7b88e82583d29dfd2020936fe09e9809aa6a068cf2b898f77b5cc97e50471aa2a06a5972f30c89 +SHA512 (linux-6.2.12.tar.xz) = a6046d0d06e8bf4f6b9aaadae25d8923b5e0983670ec30d19465771639be30fa3267b8fcb686265e0cd19d56c75e2a4a65faba6b82be2db4a0b57d35373d571b +SHA512 (kernel-abi-stablelists-6.2.12.tar.bz2) = 47e01b855e33b2be7bebd7b1d4771719c5ee66708d22ab97ac7b2677531563f5345edfad7c1cbb7b4a67c7b496e96b04bb7b275b81d336257ad153883f41e89a +SHA512 (kernel-kabi-dw-6.2.12.tar.bz2) = 829444d99c29db386c64dbd01f7eb36318999b4b0d1cc7b87b599be2a1dfccf81e89b248fe9d4b276975def8ed8336d482b56fcb958b48a688d0cf64195dec76 From 335032710ae3be7ab76203c979ffedcc917effd4 Mon Sep 17 00:00:00 2001 From: Augusto Caringi Date: Wed, 26 Apr 2023 16:17:54 -0300 Subject: [PATCH 2/4] kernel-6.2.13-300 * Wed Apr 26 2023 Augusto Caringi [6.2.13-0] - Linux v6.2.13 Resolves: Signed-off-by: Augusto Caringi --- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-ppc64le-rhel.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel-x86_64-rhel.config | 2 +- kernel.spec | 13 ++++++++----- patch-6.2-redhat.patch | 2 +- sources | 6 +++--- 24 files changed, 33 insertions(+), 30 deletions(-) diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 9993c6b1d..62b4f3e60 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2190,7 +2190,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index ee77fa98c..8da52ac59 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1694,7 +1694,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 1086b5604..da50f9d46 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2182,7 +2182,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 64d7dc2a6..a4dcff81e 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1686,7 +1686,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 9f26efb10..e0007c6ea 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2181,7 +2181,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index a255cf443..8207c0eac 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2174,7 +2174,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 70b771ed4..c3917cbda 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2135,7 +2135,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 27d068cae..ec6fe413d 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2128,7 +2128,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index b2d51603b..5a3fe4152 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1692,7 +1692,7 @@ CONFIG_EFI_SECRET=m CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y CONFIG_EFI_TEST=m -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 3adb1b3f1..bc023f143 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1513,7 +1513,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index b1138d2c3..e4d078556 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1683,7 +1683,7 @@ CONFIG_EFI_SECRET=m CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y CONFIG_EFI_TEST=m -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 954ef4429..f3caaaeb7 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1505,7 +1505,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 48d36f4cc..ff5b76e5c 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1697,7 +1697,7 @@ CONFIG_EFI_SECRET=m CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y CONFIG_EFI_TEST=m -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index bbb4bf1a0..e4c762b0f 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1517,7 +1517,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index e22a3d6ab..7c4f9fdfa 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1688,7 +1688,7 @@ CONFIG_EFI_SECRET=m CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y CONFIG_EFI_TEST=m -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 854faec64..27e3df5b9 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1509,7 +1509,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index ac89a4aba..c2d5c76e2 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1514,7 +1514,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EISA is not set CONFIG_ELF_CORE=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index b03bfecdc..6a5c5dbdd 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1856,7 +1856,7 @@ CONFIG_EFIVAR_FS=y # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set # CONFIG_EFI_VARS_PSTORE is not set CONFIG_EFI=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 3d74efe65..0913e4fa6 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1619,7 +1619,7 @@ CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS=y CONFIG_EFI=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 3a3ac3162..067cab59e 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1847,7 +1847,7 @@ CONFIG_EFIVAR_FS=y # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set # CONFIG_EFI_VARS_PSTORE is not set CONFIG_EFI=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index c825cf389..bbb6d7bc1 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1611,7 +1611,7 @@ CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS=y CONFIG_EFI=y -# CONFIG_EFI_ZBOOT is not set +CONFIG_EFI_ZBOOT=y # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/kernel.spec b/kernel.spec index 7094fc168..c796aefe8 100755 --- a/kernel.spec +++ b/kernel.spec @@ -148,17 +148,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.12 +%define specversion 6.2.13 %define patchversion 6.2 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.12 +%define tarfile_release 6.2.13 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.12 +%define kabiversion 6.2.13 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -502,8 +502,8 @@ Summary: The Linux kernel %define all_arch_configs kernel-%{version}-aarch64*.config %define asmarch arm64 %define hdrarch arm64 -%define make_target Image.gz -%define kernel_image arch/arm64/boot/Image.gz +%define make_target vmlinuz.efi +%define kernel_image arch/arm64/boot/vmlinuz.efi %endif # Should make listnewconfig fail if there's config options @@ -3346,6 +3346,9 @@ fi # # %changelog +* Wed Apr 26 2023 Augusto Caringi [6.2.13-0] +- Linux v6.2.13 + * Thu Apr 20 2023 Augusto Caringi [6.2.12-0] - Add bugs fixed by 6.2.12 (Justin M. Forbes) - Use RHJOBS for create-tarball (Don Zickus) diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index c7028a528..9e0024eb0 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -123,7 +123,7 @@ index 000000000000..1b2a1baa26f9 + +... diff --git a/Makefile b/Makefile -index 068374cc2601..ae60a40c82ec 100644 +index f76a4a63aaf5..99ef38850d7e 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index dd8b0b42f..47cd7eb12 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2.12.tar.xz) = a6046d0d06e8bf4f6b9aaadae25d8923b5e0983670ec30d19465771639be30fa3267b8fcb686265e0cd19d56c75e2a4a65faba6b82be2db4a0b57d35373d571b -SHA512 (kernel-abi-stablelists-6.2.12.tar.bz2) = 47e01b855e33b2be7bebd7b1d4771719c5ee66708d22ab97ac7b2677531563f5345edfad7c1cbb7b4a67c7b496e96b04bb7b275b81d336257ad153883f41e89a -SHA512 (kernel-kabi-dw-6.2.12.tar.bz2) = 829444d99c29db386c64dbd01f7eb36318999b4b0d1cc7b87b599be2a1dfccf81e89b248fe9d4b276975def8ed8336d482b56fcb958b48a688d0cf64195dec76 +SHA512 (linux-6.2.13.tar.xz) = 83054fedece0e2fb2ab2f560ffd6b98458e8666aa3fe8a06ea0598db1e8efc14039bb31cc9b7a0be150184cf935cab5d735ecdc585cdb0a8dfd47924d4b25686 +SHA512 (kernel-abi-stablelists-6.2.13.tar.bz2) = 28d9351eb0c89560f8f6a3cd66cce1abe250ec3928274cf3c64c5481fc95f87690d50a5f889b34dcb5fc2cbd3f08367f4e7a38fab4c9fb96f9dfdbcf1dd165df +SHA512 (kernel-kabi-dw-6.2.13.tar.bz2) = 0ca04381afe022e60782cd2120a6be647d8b713588424ad60470d2f5da60b56d401c416ae36cde557e45563a816e50fd463f1b002164bedaef028707298044f9 From 982986f037c731b581d2e6b6a4e321448c49138a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sun, 30 Apr 2023 19:03:42 -0500 Subject: [PATCH 3/4] kernel-6.2.14-300 * Sun Apr 30 2023 Justin M. Forbes [6.2.14-0] - Linux v6.2.14 Resolves: Signed-off-by: Justin M. Forbes --- kernel.spec | 9 ++++++--- patch-6.2-redhat.patch | 2 +- sources | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/kernel.spec b/kernel.spec index c796aefe8..894a18480 100755 --- a/kernel.spec +++ b/kernel.spec @@ -148,17 +148,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.13 +%define specversion 6.2.14 %define patchversion 6.2 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.13 +%define tarfile_release 6.2.14 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.13 +%define kabiversion 6.2.14 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3346,6 +3346,9 @@ fi # # %changelog +* Sun Apr 30 2023 Justin M. Forbes [6.2.14-0] +- Linux v6.2.14 + * Wed Apr 26 2023 Augusto Caringi [6.2.13-0] - Linux v6.2.13 diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 9e0024eb0..95ab5678d 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -123,7 +123,7 @@ index 000000000000..1b2a1baa26f9 + +... diff --git a/Makefile b/Makefile -index f76a4a63aaf5..99ef38850d7e 100644 +index 031d40ad0bd9..66edabb9f60d 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 47cd7eb12..aeb204063 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2.13.tar.xz) = 83054fedece0e2fb2ab2f560ffd6b98458e8666aa3fe8a06ea0598db1e8efc14039bb31cc9b7a0be150184cf935cab5d735ecdc585cdb0a8dfd47924d4b25686 -SHA512 (kernel-abi-stablelists-6.2.13.tar.bz2) = 28d9351eb0c89560f8f6a3cd66cce1abe250ec3928274cf3c64c5481fc95f87690d50a5f889b34dcb5fc2cbd3f08367f4e7a38fab4c9fb96f9dfdbcf1dd165df -SHA512 (kernel-kabi-dw-6.2.13.tar.bz2) = 0ca04381afe022e60782cd2120a6be647d8b713588424ad60470d2f5da60b56d401c416ae36cde557e45563a816e50fd463f1b002164bedaef028707298044f9 +SHA512 (linux-6.2.14.tar.xz) = 53bacb23738dee60f8aca9d5abeec53836d18e679f4627a1557a45a273ff4a03ce1071da0c1222a13a0494026291ed0843008ab6aaf639489cc4c9c304b1f6fe +SHA512 (kernel-abi-stablelists-6.2.14.tar.bz2) = 2748d2dce508945b9453753d62c94c92af9a520cfb8cd090539216f8abc625a527c4003c44c4782ca99c6c45ca21c83ba489b636dc7bc11607d8115b299484c2 +SHA512 (kernel-kabi-dw-6.2.14.tar.bz2) = 9e8063ee46c003cd9669b41a124be786b914d100036bfe3402a69cfe9042f81a2c2fff1969c5bcf415af0dd4b38df52bf20c2c3be11872f72c78dcf2505e6183 From 05d3f2ecbeb4e2cde978415c31699d6622706f08 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 11 May 2023 10:23:07 -0500 Subject: [PATCH 4/4] kernel-6.2.15-300 * Thu May 11 2023 Justin M. Forbes [6.2.15-0] - redhat: configs: generic: x86: Disable CONFIG_VIDEO_OV2740 for x86 platform (Kate Hsuan) - Add Bugs to be fixed in 6.2.15 (Justin M. Forbes) - xfs: verify buffer contents when we skip log replay (Darrick J. Wong) - Linux v6.2.15 Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 +++ kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel.spec | 12 ++++++++--- patch-6.2-redhat.patch | 34 +++++++++++++++++++++++++------ sources | 6 +++--- 6 files changed, 45 insertions(+), 14 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index bf8c6056a..0fb0046fa 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/031984ff6b9b3a71724ccaf58e6bd26cd1997a5f + 031984ff6b9b3a71724ccaf58e6bd26cd1997a5f xfs: verify buffer contents when we skip log replay + "https://gitlab.com/cki-project/kernel-ark/-/commit"/efa74f28ec858cb955be08faf1086f05c3f7510a efa74f28ec858cb955be08faf1086f05c3f7510a arm64: dts: rk3399-pinephone-pro: Add touchscreen support diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 6a5c5dbdd..7c371cb1a 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -7897,7 +7897,7 @@ CONFIG_VIDEO_OV2640=m CONFIG_VIDEO_OV2659=m CONFIG_VIDEO_OV2680=m CONFIG_VIDEO_OV2685=m -CONFIG_VIDEO_OV2740=m +# CONFIG_VIDEO_OV2740 is not set CONFIG_VIDEO_OV4689=m CONFIG_VIDEO_OV5640=m CONFIG_VIDEO_OV5645=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 067cab59e..ce8bfa1df 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -7875,7 +7875,7 @@ CONFIG_VIDEO_OV2640=m CONFIG_VIDEO_OV2659=m CONFIG_VIDEO_OV2680=m CONFIG_VIDEO_OV2685=m -CONFIG_VIDEO_OV2740=m +# CONFIG_VIDEO_OV2740 is not set CONFIG_VIDEO_OV4689=m CONFIG_VIDEO_OV5640=m CONFIG_VIDEO_OV5645=m diff --git a/kernel.spec b/kernel.spec index 894a18480..89cf75356 100755 --- a/kernel.spec +++ b/kernel.spec @@ -148,17 +148,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.14 +%define specversion 6.2.15 %define patchversion 6.2 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.14 +%define tarfile_release 6.2.15 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.14 +%define kabiversion 6.2.15 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3346,6 +3346,12 @@ fi # # %changelog +* Thu May 11 2023 Justin M. Forbes [6.2.15-0] +- redhat: configs: generic: x86: Disable CONFIG_VIDEO_OV2740 for x86 platform (Kate Hsuan) +- Add Bugs to be fixed in 6.2.15 (Justin M. Forbes) +- xfs: verify buffer contents when we skip log replay (Darrick J. Wong) +- Linux v6.2.15 + * Sun Apr 30 2023 Justin M. Forbes [6.2.14-0] - Linux v6.2.14 diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 95ab5678d..60ba7c394 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -26,6 +26,7 @@ drivers/iommu/iommu.c | 22 + drivers/pci/quirks.c | 24 + drivers/usb/core/hub.c | 7 + + fs/xfs/xfs_buf_item_recover.c | 10 + include/linux/efi.h | 22 +- include/linux/lsm_hook_defs.h | 2 + include/linux/lsm_hooks.h | 6 + @@ -38,7 +39,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 40 files changed, 1634 insertions(+), 177 deletions(-) + 41 files changed, 1644 insertions(+), 177 deletions(-) diff --git a/Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml b/Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml new file mode 100644 @@ -123,7 +124,7 @@ index 000000000000..1b2a1baa26f9 + +... diff --git a/Makefile b/Makefile -index 031d40ad0bd9..66edabb9f60d 100644 +index 9f535df81b03..3f92ef879b76 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1679,7 +1680,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index f8100067502f..e0823c45e2fa 100644 +index e6f2a0bc9f0b..537fc8197a21 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1690,7 +1691,7 @@ index f8100067502f..e0823c45e2fa 100644 #include #include #include -@@ -2813,6 +2814,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) +@@ -2818,6 +2819,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) } EXPORT_SYMBOL_GPL(iommu_dev_disable_feature); @@ -1719,10 +1720,10 @@ index f8100067502f..e0823c45e2fa 100644 * Changes the default domain of an iommu group that has *only* one device * diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 494fa46f5767..27bc8dd45ad8 100644 +index 8d32a3834688..4957f0a42315 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4296,6 +4296,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, +@@ -4309,6 +4309,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084, quirk_bridge_cavm_thrx2_pcie_root); @@ -1771,6 +1772,27 @@ index 97a0f8faea6e..d837548d2024 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); +diff --git a/fs/xfs/xfs_buf_item_recover.c b/fs/xfs/xfs_buf_item_recover.c +index ffa94102094d..43167f543afc 100644 +--- a/fs/xfs/xfs_buf_item_recover.c ++++ b/fs/xfs/xfs_buf_item_recover.c +@@ -943,6 +943,16 @@ xlog_recover_buf_commit_pass2( + if (lsn && lsn != -1 && XFS_LSN_CMP(lsn, current_lsn) >= 0) { + trace_xfs_log_recover_buf_skip(log, buf_f); + xlog_recover_validate_buf_type(mp, bp, buf_f, NULLCOMMITLSN); ++ ++ /* ++ * We're skipping replay of this buffer log item due to the log ++ * item LSN being behind the ondisk buffer. Verify the buffer ++ * contents since we aren't going to run the write verifier. ++ */ ++ if (bp->b_ops) { ++ bp->b_ops->verify_read(bp); ++ error = bp->b_error; ++ } + goto out_release; + } + diff --git a/include/linux/efi.h b/include/linux/efi.h index ac22f7ca195a..e680835ad387 100644 --- a/include/linux/efi.h diff --git a/sources b/sources index aeb204063..3b94e9ada 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2.14.tar.xz) = 53bacb23738dee60f8aca9d5abeec53836d18e679f4627a1557a45a273ff4a03ce1071da0c1222a13a0494026291ed0843008ab6aaf639489cc4c9c304b1f6fe -SHA512 (kernel-abi-stablelists-6.2.14.tar.bz2) = 2748d2dce508945b9453753d62c94c92af9a520cfb8cd090539216f8abc625a527c4003c44c4782ca99c6c45ca21c83ba489b636dc7bc11607d8115b299484c2 -SHA512 (kernel-kabi-dw-6.2.14.tar.bz2) = 9e8063ee46c003cd9669b41a124be786b914d100036bfe3402a69cfe9042f81a2c2fff1969c5bcf415af0dd4b38df52bf20c2c3be11872f72c78dcf2505e6183 +SHA512 (linux-6.2.15.tar.xz) = c80d5c05a6bf06dcc758629644806ef5d5e59aabea8ccb6c4baf0a6b292d386341f49cf0312f05fd3ed3551af70bfc2ec2c192ab8fce874340f46353d967dc86 +SHA512 (kernel-abi-stablelists-6.2.15.tar.bz2) = 47b0a74f77a1427f4386d0ae0bab8fb7aefa645792aea3a67ab56433de2339065f23328779bf8c3055f765b6a0e10f5908f876b8c655773823bda2cf72dd8b76 +SHA512 (kernel-kabi-dw-6.2.15.tar.bz2) = 7787ef9bbe0fe892cedf650e855ef164ef4f446bc305b998585ca1b237ec101a8395d896939c93d3cbff3e901591fe82ca4769c4fb4350418b361848071663c4