From 29ba48b301e74204d1000d709cc0c48e3dba58a9 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 17 Oct 2022 08:06:39 -0500 Subject: [PATCH] kernel-6.1.0-0.rc1.15 * Mon Oct 17 2022 Fedora Kernel Team [6.1.0-0.rc1.15] - Revert "redhat: properly handle binary files in patches" (Akihiko Odaki) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 1 + kernel-aarch64-debug-rhel.config | 1 + kernel-aarch64-fedora.config | 1 + kernel-aarch64-rhel.config | 1 + kernel-armv7hl-debug-fedora.config | 1 + kernel-armv7hl-fedora.config | 1 + kernel-armv7hl-lpae-debug-fedora.config | 1 + kernel-armv7hl-lpae-fedora.config | 1 + kernel-ppc64le-debug-fedora.config | 1 + kernel-ppc64le-debug-rhel.config | 1 + kernel-ppc64le-fedora.config | 1 + kernel-ppc64le-rhel.config | 1 + kernel-s390x-debug-fedora.config | 1 + kernel-s390x-debug-rhel.config | 1 + kernel-s390x-fedora.config | 1 + kernel-s390x-rhel.config | 1 + kernel-s390x-zfcpdump-rhel.config | 1 + kernel-x86_64-debug-fedora.config | 1 + kernel-x86_64-debug-rhel.config | 1 + kernel-x86_64-fedora.config | 1 + kernel-x86_64-rhel.config | 1 + kernel.spec | 25 +++++++++++++++++++------ patch-6.1-redhat.patch | 8 ++++---- sources | 6 +++--- 25 files changed, 48 insertions(+), 14 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 3e1b29e09..39d4dc1fe 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 = 11 +RHEL_RELEASE = 15 # # ZSTREAM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 17d346641..bc723d22a 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -379,6 +379,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2658417=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index b33a44a05..43c95aae4 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -305,6 +305,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2658417=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 0dd07af41..a474d6abf 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -379,6 +379,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2658417=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 5f135f734..2fd5b5fb6 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -305,6 +305,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2658417=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 971693165..4c3f5272b 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -369,6 +369,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index f6f571925..407770f26 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -369,6 +369,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 620f7031e..128de7b9f 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -361,6 +361,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 68087e11d..7c4746185 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -361,6 +361,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index fb6ad1893..33b501be0 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -278,6 +278,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 7bb43b8e3..dd9818780 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -252,6 +252,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2658417=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 1e44d6a9b..9c947bdee 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -278,6 +278,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index c0347c29d..7bb2e81b0 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -252,6 +252,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2658417=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 0f160961d..51c5b2e46 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -281,6 +281,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index ea9a2ef7b..b1d401aa0 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -251,6 +251,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2658417=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 561d7c234..aa7191bd5 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -281,6 +281,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 2d5ba58fc..261b4cfeb 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -251,6 +251,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2658417=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 9cdc64f23..ca4bf82d2 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -251,6 +251,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2658417=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index aa5b4fbc2..d7503e7bb 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -315,6 +315,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 4e960f8ce..b3d442dfd 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -274,6 +274,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2658417=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 5fe700a24..ffe97cfcf 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -315,6 +315,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_858921=y CONFIG_ARM64_USE_LSE_ATOMICS=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 7bda57dfd..74e76eaf2 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -274,6 +274,7 @@ CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_ERRATUM_2224489=y CONFIG_ARM64_ERRATUM_2253138=y +CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2658417=y diff --git a/kernel.spec b/kernel.spec index a71166e84..f8846a66a 100755 --- a/kernel.spec +++ b/kernel.spec @@ -120,17 +120,17 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # define buildid .local %define specversion 6.1.0 %define patchversion 6.1 -%define pkgrelease 0.rc0.20221014git9c9155a3509a.11 +%define pkgrelease 0.rc1.15 %define kversion 6 -%define tarfile_release 6.0-11990-g9c9155a3509a +%define tarfile_release 6.1-rc1 # This is needed to do merge window version magic %define patchlevel 1 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20221014git9c9155a3509a.11%{?buildid}%{?dist} +%define specrelease 0.rc1.15%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.1.0 @@ -575,7 +575,7 @@ Requires: kernel-modules-uname-r = %{KVERREL} # # List the packages used during the kernel build # -BuildRequires: kmod, bash, coreutils, tar, git-core, which +BuildRequires: kmod, patch, bash, coreutils, tar, git-core, which BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++ BuildRequires: net-tools, hostname, bc, elfutils-devel @@ -1392,7 +1392,7 @@ if [ "%{patches}" != "%%{patches}" ] ; then done fi 2>/dev/null -patch_command='git apply' +patch_command='patch -p1 -F1 -s' ApplyPatch() { local patch=$1 @@ -3185,6 +3185,19 @@ fi # # %changelog +* Mon Oct 17 2022 Fedora Kernel Team [6.1.0-0.rc1.15] +- Revert "redhat: properly handle binary files in patches" (Akihiko Odaki) + +* Mon Oct 17 2022 Fedora Kernel Team [6.1.0-0.rc1.14] +- Linux v6.1.0-0.rc1 + +* Sun Oct 16 2022 Fedora Kernel Team [6.1.0-0.rc0.1501278bb7ba.13] +- Linux v6.1.0-0.rc0.1501278bb7ba + +* Sat Oct 15 2022 Fedora Kernel Team [6.1.0-0.rc0.19d17ab7c68b.12] +- Turn on Multi-Gen LRU for Fedora (Justin M. Forbes) +- Linux v6.1.0-0.rc0.19d17ab7c68b + * Fri Oct 14 2022 Fedora Kernel Team [6.1.0-0.rc0.9c9155a3509a.11] - Add kasan_test to mod-internal.list (Justin M. Forbes) - redhat/Makefile.variables: Fix typo with RHDISTGIT_TMP (Prarit Bhargava) diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch index a4cbc0aea..4f296e91f 100644 --- a/patch-6.1-redhat.patch +++ b/patch-6.1-redhat.patch @@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index cfbe6a7de640..80a3a35a9c36 100644 +index f41ec8c8426b..4781baaf709c 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -166,10 +166,10 @@ index a08c9d092a33..1d82f6e9ecbd 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index f6737d2f37b2..831201c75275 100644 +index 505c8a1ccbe0..575f77325e60 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1195,7 +1195,7 @@ endchoice +@@ -1212,7 +1212,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -178,7 +178,7 @@ index f6737d2f37b2..831201c75275 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -@@ -1434,6 +1434,7 @@ config XEN +@@ -1451,6 +1451,7 @@ config XEN config ARCH_FORCE_MAX_ORDER int default "14" if ARM64_64K_PAGES diff --git a/sources b/sources index 9fee50110..a5691ab5f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.0-11990-g9c9155a3509a.tar.xz) = 55738345f56895cc1fa594c4f843f42b0db2a1618caf3b70d2f7cb32309c112041294763d9499719b844ec4cbab9f1e4eeffb641ce02545311597467483df4dd -SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 4473a43b7dc4913cb583e42d5cacb73ecfde057cade74a37ec480b4a19fd01fe64cd9d89fea60a3bfb29a99882a1028d4c8535d1a996a0bae68e7ae59dc1ede3 -SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = e112bda05dfd5e4536423387becc855064bf95718486ea542fb9964d84434aab5c3fb422d8d2017ae7c6b2fa06eec8a5984c71ab4a9d26ade3c397f56066429e +SHA512 (linux-6.1-rc1.tar.xz) = 11ea867568d37186d13d2289c39085bcbce6ade74fc92d8bdf76f1fb7dbb81362e9380821aa28fbfeb409252f16c0ccf726c5f49e683517087d3e3db1b74dc88 +SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = e901e327d5616651e76128faf3c2b99d888eefc386ba2ad97da4910d6aeae538e7e8d3e4e1fbfc9857451be25924c9aa1c572bb26a966ea7a54a11b04b97f937 +SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 1e9e716e817ac6a98f2cbbd841d524e69c79b3316232a3705edebb4f9b31e3d7765e8f520e4fd5fb1edbf695f59ebb47c98c0522f136e72186d3d7a2545cb29b