summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-02-11 13:13:28 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2022-02-11 13:13:28 +0100
commit97d99b34758e284425ec26377e1bf1e2df68a480 (patch)
treef90073bbde8a148d535cf9aa650bb1cfb0c22a01
parenta5eed386af6f34e7eaea9a1c781709c3a08eafb5 (diff)
parenta87a12aefed821bcdb13d024b21d9384e1786105 (diff)
downloadkernel-5.17.0-0.rc3.20220210gitf4bc5bbb5fef.92.vanilla.1.fc36.tar.gz
kernel-5.17.0-0.rc3.20220210gitf4bc5bbb5fef.92.vanilla.1.fc36.tar.xz
kernel-5.17.0-0.rc3.20220210gitf4bc5bbb5fef.92.vanilla.1.fc36.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc3.20220210gitf4bc5bbb5fef.92.vanilla.1.fc37kernel-5.17.0-0.rc3.20220210gitf4bc5bbb5fef.92.vanilla.1.fc36kernel-5.17.0-0.rc3.20220210gitf4bc5bbb5fef.92.vanilla.1.fc35kernel-5.17.0-0.rc3.20220210gitf4bc5bbb5fef.92.vanilla.1.fc34
Diffstat
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog8
-rw-r--r--kernel-armv7hl-debug-fedora.config1
-rw-r--r--kernel-armv7hl-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-fedora.config1
-rw-r--r--kernel-i686-debug-fedora.config1
-rw-r--r--kernel-i686-fedora.config1
-rw-r--r--kernel-ppc64le-debug-fedora.config1
-rw-r--r--kernel-ppc64le-debug-rhel.config1
-rw-r--r--kernel-ppc64le-fedora.config1
-rw-r--r--kernel-ppc64le-rhel.config1
-rw-r--r--kernel-s390x-debug-fedora.config1
-rw-r--r--kernel-s390x-debug-rhel.config1
-rw-r--r--kernel-s390x-fedora.config1
-rw-r--r--kernel-s390x-rhel.config1
-rw-r--r--kernel-s390x-zfcpdump-rhel.config1
-rw-r--r--kernel-x86_64-debug-fedora.config1
-rw-r--r--kernel-x86_64-debug-rhel.config1
-rw-r--r--kernel-x86_64-fedora.config1
-rw-r--r--kernel-x86_64-rhel.config1
-rwxr-xr-xkernel.spec17
-rw-r--r--sources6
23 files changed, 18 insertions, 34 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 7ce1c04b3..715f978e9 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 = 91
+RHEL_RELEASE = 92
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 0e8593342..037042e3e 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,8 +1,8 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/6d02659cb04789f97096a72625e368c7b29bfc6d
- 6d02659cb04789f97096a72625e368c7b29bfc6d mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
+https://gitlab.com/cki-project/kernel-ark/-/commit/f2e9a5dcb98ca92feebf41be9205d77afe524c29
+ f2e9a5dcb98ca92feebf41be9205d77afe524c29 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
-https://gitlab.com/cki-project/kernel-ark/-/commit/6a5d9c6e038956adbfef982ac4bf8c2b78cb05d3
- 6a5d9c6e038956adbfef982ac4bf8c2b78cb05d3 Workaround for gcc12 compile issues in ubcmd-util.h
+https://gitlab.com/cki-project/kernel-ark/-/commit/43fe05955597db8314e24da463f82e185a26825c
+ 43fe05955597db8314e24da463f82e185a26825c Workaround for gcc12 compile issues in ubcmd-util.h
https://gitlab.com/cki-project/kernel-ark/-/commit/4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b
4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b objtool: check: give big enough buffer for pv_ops
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 1fc6b2fc2..332f372d3 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -356,7 +356,6 @@ CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARMADA_37XX_RWTM_MBOX=m
# CONFIG_ARMADA_37XX_WATCHDOG is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index deca9f603..cb0daad85 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -356,7 +356,6 @@ CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARMADA_37XX_RWTM_MBOX=m
# CONFIG_ARMADA_37XX_WATCHDOG is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 678ecd59c..24f44c715 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -348,7 +348,6 @@ CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARMADA_37XX_RWTM_MBOX=m
# CONFIG_ARMADA_37XX_WATCHDOG is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 56c56f770..4346a1a57 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -348,7 +348,6 @@ CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARMADA_37XX_RWTM_MBOX=m
# CONFIG_ARMADA_37XX_WATCHDOG is not set
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index e72479959..1a04eb78c 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -305,7 +305,6 @@ CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 4cf0701a7..b9517ed8b 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -305,7 +305,6 @@ CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 1127332fa..a01f7e6c6 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -269,7 +269,6 @@ CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index d93dada15..4bd1c8538 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -225,7 +225,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 30275b849..9359fff0c 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -269,7 +269,6 @@ CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 9e1b50915..a0688c3a4 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -225,7 +225,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 95115ec26..4e18cddbc 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -273,7 +273,6 @@ CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 779acbdd7..aa7da57d9 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -225,7 +225,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 1731e8f36..2be2a7809 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -273,7 +273,6 @@ CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 96c680902..e02f10a14 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -225,7 +225,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index b7d644731..7f00af2dd 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -225,7 +225,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index a71bae666..3b1fab000 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -307,7 +307,6 @@ CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 0c36c3f2e..bc21e6226 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -249,7 +249,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 1945ba6b7..0787d6927 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -307,7 +307,6 @@ CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
CONFIG_ARM64_ERRATUM_858921=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 6e303c993..58706b50d 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -249,7 +249,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_MTE=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM_CMN=m
# CONFIG_ARM_MHU_V2 is not set
diff --git a/kernel.spec b/kernel.spec
index e14b59de8..585bc0022 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc3.20220209gite6251ab4551f.91
+%global distro_build 0.rc3.20220210gitf4bc5bbb5fef.92
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -134,13 +134,13 @@ Summary: The Linux kernel
%define rpmversion 5.17.0
%define patchversion 5.17
-%define pkgrelease 0.rc3.20220209gite6251ab4551f.91
+%define pkgrelease 0.rc3.20220210gitf4bc5bbb5fef.92
# This is needed to do merge window version magic
%define patchlevel 17
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc3.20220209gite6251ab4551f.91%{?buildid}%{?dist}
+%define specrelease 0.rc3.20220210gitf4bc5bbb5fef.92%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -697,7 +697,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17-rc3-29-ge6251ab4551f.tar.xz
+Source0: linux-5.17-rc3-43-gf4bc5bbb5fef.tar.xz
Source1: Makefile.rhelver
@@ -1396,8 +1396,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.17-rc3-29-ge6251ab4551f -c
-mv linux-5.17-rc3-29-ge6251ab4551f linux-%{KVERREL}
+%setup -q -n kernel-5.17-rc3-43-gf4bc5bbb5fef -c
+mv linux-5.17-rc3-43-gf4bc5bbb5fef linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -3018,10 +3018,13 @@ fi
#
#
%changelog
-* Wed Feb 09 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc3.e6251ab4551f.91]
+* Thu Feb 10 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc3.f4bc5bbb5fef.92]
- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
- Workaround for gcc12 compile issues in ubcmd-util.h (Justin M. Forbes)
+* Thu Feb 10 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc3.f4bc5bbb5fef.91]
+- redhat: move CONFIG_ARM64_MTE to aarch64 config directory (Herton R. Krzesinski)
+
* Wed Feb 09 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc3.e6251ab4551f.90]
- Change CONFIG_TEST_BPF to a module (Justin M. Forbes)
- Change CONFIG_TEST_BPF to module in pending MR coming for proper review (Justin M. Forbes)
diff --git a/sources b/sources
index 0af798a4a..59fd9c44b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.17-rc3-29-ge6251ab4551f.tar.xz) = 2dcb7913c6ef444bfddeb2355f031228471247996fb447e984f79de463953b755d3208bceacf14241bafdec90fdaa4548f77204fbd0801bf5d51416bd27497e1
-SHA512 (kernel-abi-stablelists-5.17.0-0.rc3.20220209gite6251ab4551f.91.tar.bz2) = e68055250c881d37438f3119e1f2e0ee65be379b96e9f9ab75308e2310bd005ed40f86a04b4e32fca09ba75e2d2c8f15d1801f93739bcd45500b8bbc58c859b8
-SHA512 (kernel-kabi-dw-5.17.0-0.rc3.20220209gite6251ab4551f.91.tar.bz2) = 70e579f4723e6d99aa32fe7088d9f7f513cb49b3acc48b6528a24137a8b52dabf6ad97aa80e0c625870b731fd6f76cac812fbdde2cb6363999d0f327df0e5a9b
+SHA512 (linux-5.17-rc3-43-gf4bc5bbb5fef.tar.xz) = ed05d79f109b35ba2117bf19713e1243034815e54847cc0134700fcff61e73a6978458e010195d2f976017f7eadd59f0371f01bd22df8de3cfda500dc5747aac
+SHA512 (kernel-abi-stablelists-5.17.0-0.rc3.20220210gitf4bc5bbb5fef.92.tar.bz2) = 20b37370afc469785d0d59d111e11edc1bc6d3c51f358dc6343fe452447e64d82e5959598faaa0461b1d69aca806253a7a7538b06ee58ffb22395dd3264dde1c
+SHA512 (kernel-kabi-dw-5.17.0-0.rc3.20220210gitf4bc5bbb5fef.92.tar.bz2) = 345d85f4825a0f454fda218c3e24304dc94da5abbf55bea892163cca3670e9e4d325f4c37c2d0ab90fe31e84cd2e41ad700ecea53609083d90cc3e27aec1feef
generated by cgit (git 2.34.1) at 2024-04-16 10:25:17 +0000