From 1efd1ad096a7ace2b6083d1bcd7b54ed2d110782 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 4 May 2022 09:41:14 -0500 Subject: kernel-5.18.0-0.rc5.20220504git107c948d1d3e61d.42 * Mon May 02 2022 Fedora Kernel Team [5.18.0-0.rc5.39] - redhat/configs: Set GUP_TEST in debug kernel (Joel Savitz) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-rhel.config | 4 ++-- kernel-aarch64-rhel.config | 4 ++-- kernel-ppc64le-debug-rhel.config | 4 ++-- kernel-ppc64le-rhel.config | 4 ++-- kernel-s390x-debug-rhel.config | 4 ++-- kernel-s390x-rhel.config | 4 ++-- kernel-s390x-zfcpdump-rhel.config | 4 ++-- kernel-x86_64-debug-rhel.config | 4 ++-- kernel-x86_64-rhel.config | 4 ++-- kernel.spec | 10 +++++----- sources | 6 +++--- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 616f1636b..645be0a98 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 = 41 +RHEL_RELEASE = 42 # # ZSTREAM diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 40e53af41..fe9d57211 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3667,13 +3667,13 @@ CONFIG_NET_VENDOR_CAVIUM=y CONFIG_NET_VENDOR_CHELSIO=y # CONFIG_NET_VENDOR_CISCO is not set # CONFIG_NET_VENDOR_CORTINA is not set -CONFIG_NET_VENDOR_DAVICOM=y +# CONFIG_NET_VENDOR_DAVICOM is not set # CONFIG_NET_VENDOR_DEC is not set # CONFIG_NET_VENDOR_DLINK is not set # CONFIG_NET_VENDOR_EMULEX is not set # CONFIG_NET_VENDOR_ENGLEDER is not set # CONFIG_NET_VENDOR_EZCHIP is not set -CONFIG_NET_VENDOR_FUNGIBLE=y +# CONFIG_NET_VENDOR_FUNGIBLE is not set CONFIG_NET_VENDOR_GOOGLE=y CONFIG_NET_VENDOR_HISILICON=y CONFIG_NET_VENDOR_HUAWEI=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 5a51a342b..a70faeee9 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3646,13 +3646,13 @@ CONFIG_NET_VENDOR_CAVIUM=y CONFIG_NET_VENDOR_CHELSIO=y # CONFIG_NET_VENDOR_CISCO is not set # CONFIG_NET_VENDOR_CORTINA is not set -CONFIG_NET_VENDOR_DAVICOM=y +# CONFIG_NET_VENDOR_DAVICOM is not set # CONFIG_NET_VENDOR_DEC is not set # CONFIG_NET_VENDOR_DLINK is not set # CONFIG_NET_VENDOR_EMULEX is not set # CONFIG_NET_VENDOR_ENGLEDER is not set # CONFIG_NET_VENDOR_EZCHIP is not set -CONFIG_NET_VENDOR_FUNGIBLE=y +# CONFIG_NET_VENDOR_FUNGIBLE is not set CONFIG_NET_VENDOR_GOOGLE=y CONFIG_NET_VENDOR_HISILICON=y CONFIG_NET_VENDOR_HUAWEI=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index e0df765b2..53cd83bc8 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3484,13 +3484,13 @@ CONFIG_NET_VENDOR_BROCADE=y CONFIG_NET_VENDOR_CHELSIO=y CONFIG_NET_VENDOR_CISCO=y # CONFIG_NET_VENDOR_CORTINA is not set -CONFIG_NET_VENDOR_DAVICOM=y +# CONFIG_NET_VENDOR_DAVICOM is not set CONFIG_NET_VENDOR_DEC=y # CONFIG_NET_VENDOR_DLINK is not set CONFIG_NET_VENDOR_EMULEX=y # CONFIG_NET_VENDOR_ENGLEDER is not set # CONFIG_NET_VENDOR_EZCHIP is not set -CONFIG_NET_VENDOR_FUNGIBLE=y +# CONFIG_NET_VENDOR_FUNGIBLE is not set CONFIG_NET_VENDOR_GOOGLE=y # CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_I825XX is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index d9a0cdf99..6cca52f7a 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3464,13 +3464,13 @@ CONFIG_NET_VENDOR_BROCADE=y CONFIG_NET_VENDOR_CHELSIO=y CONFIG_NET_VENDOR_CISCO=y # CONFIG_NET_VENDOR_CORTINA is not set -CONFIG_NET_VENDOR_DAVICOM=y +# CONFIG_NET_VENDOR_DAVICOM is not set CONFIG_NET_VENDOR_DEC=y # CONFIG_NET_VENDOR_DLINK is not set CONFIG_NET_VENDOR_EMULEX=y # CONFIG_NET_VENDOR_ENGLEDER is not set # CONFIG_NET_VENDOR_EZCHIP is not set -CONFIG_NET_VENDOR_FUNGIBLE=y +# CONFIG_NET_VENDOR_FUNGIBLE is not set CONFIG_NET_VENDOR_GOOGLE=y # CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_I825XX is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 4d0adad1d..7c17936f9 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3468,13 +3468,13 @@ CONFIG_NET_VENDOR_ASIX=y # CONFIG_NET_VENDOR_CHELSIO is not set # CONFIG_NET_VENDOR_CISCO is not set # CONFIG_NET_VENDOR_CORTINA is not set -CONFIG_NET_VENDOR_DAVICOM=y +# CONFIG_NET_VENDOR_DAVICOM is not set # CONFIG_NET_VENDOR_DEC is not set # CONFIG_NET_VENDOR_DLINK is not set # CONFIG_NET_VENDOR_EMULEX is not set # CONFIG_NET_VENDOR_ENGLEDER is not set # CONFIG_NET_VENDOR_EZCHIP is not set -CONFIG_NET_VENDOR_FUNGIBLE=y +# CONFIG_NET_VENDOR_FUNGIBLE is not set CONFIG_NET_VENDOR_GOOGLE=y # CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_I825XX is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 44d4d50e4..82c8c89c0 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3448,13 +3448,13 @@ CONFIG_NET_VENDOR_ASIX=y # CONFIG_NET_VENDOR_CHELSIO is not set # CONFIG_NET_VENDOR_CISCO is not set # CONFIG_NET_VENDOR_CORTINA is not set -CONFIG_NET_VENDOR_DAVICOM=y +# CONFIG_NET_VENDOR_DAVICOM is not set # CONFIG_NET_VENDOR_DEC is not set # CONFIG_NET_VENDOR_DLINK is not set # CONFIG_NET_VENDOR_EMULEX is not set # CONFIG_NET_VENDOR_ENGLEDER is not set # CONFIG_NET_VENDOR_EZCHIP is not set -CONFIG_NET_VENDOR_FUNGIBLE=y +# CONFIG_NET_VENDOR_FUNGIBLE is not set CONFIG_NET_VENDOR_GOOGLE=y # CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_I825XX is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 42631f268..ccd697336 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3461,13 +3461,13 @@ CONFIG_NET_VENDOR_ASIX=y # CONFIG_NET_VENDOR_CHELSIO is not set # CONFIG_NET_VENDOR_CISCO is not set # CONFIG_NET_VENDOR_CORTINA is not set -CONFIG_NET_VENDOR_DAVICOM=y +# CONFIG_NET_VENDOR_DAVICOM is not set # CONFIG_NET_VENDOR_DEC is not set # CONFIG_NET_VENDOR_DLINK is not set # CONFIG_NET_VENDOR_EMULEX is not set # CONFIG_NET_VENDOR_ENGLEDER is not set # CONFIG_NET_VENDOR_EZCHIP is not set -CONFIG_NET_VENDOR_FUNGIBLE=y +# CONFIG_NET_VENDOR_FUNGIBLE is not set CONFIG_NET_VENDOR_GOOGLE=y # CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_I825XX is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index e899939a7..8b0e3feef 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3660,13 +3660,13 @@ CONFIG_NET_VENDOR_BROCADE=y CONFIG_NET_VENDOR_CHELSIO=y CONFIG_NET_VENDOR_CISCO=y # CONFIG_NET_VENDOR_CORTINA is not set -CONFIG_NET_VENDOR_DAVICOM=y +# CONFIG_NET_VENDOR_DAVICOM is not set CONFIG_NET_VENDOR_DEC=y CONFIG_NET_VENDOR_DLINK=y CONFIG_NET_VENDOR_EMULEX=y # CONFIG_NET_VENDOR_ENGLEDER is not set # CONFIG_NET_VENDOR_EZCHIP is not set -CONFIG_NET_VENDOR_FUNGIBLE=y +# CONFIG_NET_VENDOR_FUNGIBLE is not set CONFIG_NET_VENDOR_GOOGLE=y CONFIG_NET_VENDOR_HUAWEI=y # CONFIG_NET_VENDOR_I825XX is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 826960d3f..5512deeb9 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3640,13 +3640,13 @@ CONFIG_NET_VENDOR_BROCADE=y CONFIG_NET_VENDOR_CHELSIO=y CONFIG_NET_VENDOR_CISCO=y # CONFIG_NET_VENDOR_CORTINA is not set -CONFIG_NET_VENDOR_DAVICOM=y +# CONFIG_NET_VENDOR_DAVICOM is not set CONFIG_NET_VENDOR_DEC=y CONFIG_NET_VENDOR_DLINK=y CONFIG_NET_VENDOR_EMULEX=y # CONFIG_NET_VENDOR_ENGLEDER is not set # CONFIG_NET_VENDOR_EZCHIP is not set -CONFIG_NET_VENDOR_FUNGIBLE=y +# CONFIG_NET_VENDOR_FUNGIBLE is not set CONFIG_NET_VENDOR_GOOGLE=y CONFIG_NET_VENDOR_HUAWEI=y # CONFIG_NET_VENDOR_I825XX is not set diff --git a/kernel.spec b/kernel.spec index 04e52fb8b..f2cb39666 100755 --- a/kernel.spec +++ b/kernel.spec @@ -129,13 +129,13 @@ Summary: The Linux kernel %define rpmversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc5.20220503git9050ba3a61a4b5b.41 +%define pkgrelease 0.rc5.20220504git107c948d1d3e61d.42 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20220503git9050ba3a61a4b5b.41%{?buildid}%{?dist} +%define specrelease 0.rc5.20220504git107c948d1d3e61d.42%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -690,7 +690,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.18-rc5-6-g9050ba3a61a4b5b.tar.xz +Source0: linux-5.18-rc5-16-g107c948d1d3e61d.tar.xz Source1: Makefile.rhelver @@ -1382,8 +1382,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc5-6-g9050ba3a61a4b5b -c -mv linux-5.18-rc5-6-g9050ba3a61a4b5b linux-%{KVERREL} +%setup -q -n kernel-5.18-rc5-16-g107c948d1d3e61d -c +mv linux-5.18-rc5-16-g107c948d1d3e61d linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . diff --git a/sources b/sources index ef44e2d49..c041c2aa5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.18-rc5-6-g9050ba3a61a4b5b.tar.xz) = bfcce539f8d12bc2727b78b5705388e78d0d8695afc4daf1517206528f4a102d6c21bd42c1b3e894f570cdd7fc7b4a713f15a455c3e5bdf2b5985de00640a6d6 -SHA512 (kernel-abi-stablelists-5.18.0-0.rc5.20220503git9050ba3a61a4b5b.41.tar.bz2) = e6537a63878c8d3d6143fc6903eee275f93990753e6c11fedef0955c0207accde6673beb9c4a66711a4328e5c7b6d2929aad31ecb3e8a4831698bcd83c66163e -SHA512 (kernel-kabi-dw-5.18.0-0.rc5.20220503git9050ba3a61a4b5b.41.tar.bz2) = 56e08ee1e7769b0ab5d72a4af399865365cad132cbbd1ccc8d15e2cfb19ca08d903f641b01ba96785830c1806b692998317964ce163f52cd256f844216c5439e +SHA512 (linux-5.18-rc5-16-g107c948d1d3e61d.tar.xz) = ac09eb31dd846a4da181e4f880075595cf44c1f868341ed2eba41614c0ec0bc5ca05d9a479ad828996e709cd7dc37f38904d4b616c08a79778cd5e039cf14d35 +SHA512 (kernel-abi-stablelists-5.18.0-0.rc5.20220504git107c948d1d3e61d.42.tar.bz2) = e29614d9ce6a3faaa18ba1e2341076d0afeea99e412ab9b5fb961a7fdb2ce4a4d12aca6ed12401c2f58a684ec11ae3c5f1cd005623a5af60f6c326c542834f1c +SHA512 (kernel-kabi-dw-5.18.0-0.rc5.20220504git107c948d1d3e61d.42.tar.bz2) = 6b0c0a612f3e14431fd65e9236657de29085095ffc72973ffcd20d64a2be4859acbae6bdb3262dc7bef72ffe343a7eae21b6e606c83dd122427a141d396df441 -- cgit