diff options
| -rw-r--r-- | Makefile.rhelver | 2 | ||||
| -rw-r--r-- | Patchlist.changelog | 4 | ||||
| -rwxr-xr-x | kernel.spec | 14 | ||||
| -rw-r--r-- | patch-5.17-redhat.patch | 12 | ||||
| -rw-r--r-- | sources | 6 |
5 files changed, 19 insertions, 19 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 7329c144b..2b812721b 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 = 117 +RHEL_RELEASE = 118 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 9d0caca91..f446ccfc1 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/8f3a339d237a2e980b10e98ab233a9649c57a80a - 8f3a339d237a2e980b10e98ab233a9649c57a80a mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning +"https://gitlab.com/cki-project/kernel-ark/-/commit"/ae713f9078aa792365a05d600c358ef42f9c0916 + ae713f9078aa792365a05d600c358ef42f9c0916 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning "https://gitlab.com/cki-project/kernel-ark/-/commit"/4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b 4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b objtool: check: give big enough buffer for pv_ops diff --git a/kernel.spec b/kernel.spec index b1c7969c8..4f8e8fe2c 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc7.20220308gitea4424be1688.117 +%global distro_build 0.rc7.20220309git330f4c53d3c2.118 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.17.0 %define patchversion 5.17 -%define pkgrelease 0.rc7.20220308gitea4424be1688.117 +%define pkgrelease 0.rc7.20220309git330f4c53d3c2.118 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20220308gitea4424be1688.117%{?buildid}%{?dist} +%define specrelease 0.rc7.20220309git330f4c53d3c2.118%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -695,7 +695,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17-rc7-20-gea4424be1688.tar.xz +Source0: linux-5.17-rc7-64-g330f4c53d3c2.tar.xz Source1: Makefile.rhelver @@ -1391,8 +1391,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc7-20-gea4424be1688 -c -mv linux-5.17-rc7-20-gea4424be1688 linux-%{KVERREL} +%setup -q -n kernel-5.17-rc7-64-g330f4c53d3c2 -c +mv linux-5.17-rc7-64-g330f4c53d3c2 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3005,7 +3005,7 @@ fi # # %changelog -* Tue Mar 08 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc7.ea4424be1688.117] +* Wed Mar 09 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc7.330f4c53d3c2.118] - redhat/configs/process_configs.sh: Fix issue with old error files (Prarit Bhargava) - redhat/configs/build_configs.sh: Parallelize execution (Prarit Bhargava) - redhat/configs/build_configs.sh: Provide better messages (Prarit Bhargava) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index 83cd93acd..4582d01de 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -77,10 +77,10 @@ 76 files changed, 1744 insertions(+), 191 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index f5a27f067db9..f4dc42f2f82a 100644 +index 7123524a86b8..9440625f58d5 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6000,6 +6000,15 @@ +@@ -6004,6 +6004,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -176,7 +176,7 @@ index 4c97cb40eebb..caf06cef3d2e 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 09b885cc4db5..73fd512bd66f 100644 +index f979ec410d6e..7c865dfbe522 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1109,7 +1109,7 @@ endchoice @@ -3268,10 +3268,10 @@ index 000000000000..345a979cd0e4 +} +EXPORT_SYMBOL(mark_tech_preview); diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 5ae443b2882e..4b929f4cb77a 100644 +index 730ab56d9e92..df217c4ed071 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -195,6 +195,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, +@@ -199,6 +199,11 @@ static int bpf_unpriv_handler(struct ctl_table *table, int write, if (write && !ret) { if (locked_state && unpriv_enable != 1) return -EPERM; @@ -3282,7 +3282,7 @@ index 5ae443b2882e..4b929f4cb77a 100644 + } *(int *)table->data = unpriv_enable; } - return ret; + diff --git a/mm/cma.c b/mm/cma.c index bc9ca8f3c487..9fa9a485eb3a 100644 --- a/mm/cma.c @@ -1,3 +1,3 @@ -SHA512 (linux-5.17-rc7-20-gea4424be1688.tar.xz) = 57a4f48ed2f8699821b42f6c1e70a084d0585d3527f56c8177eaa80c9175e1a1fd38ee4477486bf792102cfd1498833553da3d84c2cad0e2ddfcbb5362128183 -SHA512 (kernel-abi-stablelists-5.17.0-0.rc7.20220308gitea4424be1688.117.tar.bz2) = fabe51a06dc2a987289c58c02928192099120f47b9ab71a90d0ab53d2cfce87c7ee0d017587e9dbfc8ce59533c4510aa6ff1d0c8390b495894fbabb354b28564 -SHA512 (kernel-kabi-dw-5.17.0-0.rc7.20220308gitea4424be1688.117.tar.bz2) = 9acd9dabda68780a73e7464667e82358d84f25acdec6ac241bc9e5d3585275b1235d08462393288f16fe3ede11da7f10c91a7951bcdec80392c722e9cdb5967a +SHA512 (linux-5.17-rc7-64-g330f4c53d3c2.tar.xz) = 187296de6742823be4be16b71dc0e352df41452ef98f0a1e165176f6f9a3cc426bcd2bb6321cfe8482e766776e04cee1f2ca69d13cd5feb178c84184ea5c70e0 +SHA512 (kernel-abi-stablelists-5.17.0-0.rc7.20220309git330f4c53d3c2.118.tar.bz2) = c817e1b6b0beaafc8390fd625b24b300602c88add119e515dc80af3de28db5caa5d84f05fc18c1d1e85c239f478c129f300d730208fecee3c6fe40e645f66def +SHA512 (kernel-kabi-dw-5.17.0-0.rc7.20220309git330f4c53d3c2.118.tar.bz2) = 3d5e2460353f95dee12e4ea32cb36b63c186d27ebe63649af2cfb494294f3fbeb5e92c1d6b567b5d5f4dfcdb00b27bf3b82b06756d44c4a3d8c0201a4c4234cf |