diff options
26 files changed, 13 insertions, 33 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 9840027a8..b9aa97e4b 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 = 27 +RHEL_RELEASE = 28 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 752a75577..f9c46c8be 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2926,7 +2926,6 @@ CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_CXGB4=m CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index c975284fb..de3a388bd 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2325,7 +2325,6 @@ CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_HNS_HIP06 is not set # CONFIG_INFINIBAND_HNS_HIP08 is not set # CONFIG_INFINIBAND_HNS is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 03f9f00b1..b02c06a67 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2910,7 +2910,6 @@ CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_CXGB4=m CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 7aa238596..a177c7198 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2309,7 +2309,6 @@ CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_HNS_HIP06 is not set # CONFIG_INFINIBAND_HNS_HIP08 is not set # CONFIG_INFINIBAND_HNS is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index ece8765ac..40b8357e5 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2946,7 +2946,6 @@ CONFIG_INFINIBAND_ADDR_TRANS=y # CONFIG_INFINIBAND_CXGB4 is not set CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -# CONFIG_INFINIBAND_I40IW is not set # CONFIG_INFINIBAND_IPOIB_CM is not set # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set # CONFIG_INFINIBAND_IPOIB_DEBUG is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 0cd737dd7..5dc33f40c 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2931,7 +2931,6 @@ CONFIG_INFINIBAND_ADDR_TRANS=y # CONFIG_INFINIBAND_CXGB4 is not set CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -# CONFIG_INFINIBAND_I40IW is not set # CONFIG_INFINIBAND_IPOIB_CM is not set # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set # CONFIG_INFINIBAND_IPOIB_DEBUG is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index adbf9fea7..864781db2 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2888,7 +2888,6 @@ CONFIG_INFINIBAND_ADDR_TRANS=y # CONFIG_INFINIBAND_CXGB4 is not set CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -# CONFIG_INFINIBAND_I40IW is not set # CONFIG_INFINIBAND_IPOIB_CM is not set # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set # CONFIG_INFINIBAND_IPOIB_DEBUG is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 5b4496b40..95b9f2d03 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2873,7 +2873,6 @@ CONFIG_INFINIBAND_ADDR_TRANS=y # CONFIG_INFINIBAND_CXGB4 is not set CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -# CONFIG_INFINIBAND_I40IW is not set # CONFIG_INFINIBAND_IPOIB_CM is not set # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set # CONFIG_INFINIBAND_IPOIB_DEBUG is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index eef624dbf..802a3511e 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -2559,7 +2559,6 @@ CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_CXGB4=m CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index c8e5f43e5..3192b61c3 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -2542,7 +2542,6 @@ CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_CXGB4=m CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 2cb785237..3847ed919 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2390,7 +2390,6 @@ CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_CXGB4=m CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 0a9cf5fcd..dd6fd72a0 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2149,7 +2149,6 @@ CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_HNS_HIP06 is not set # CONFIG_INFINIBAND_HNS_HIP08 is not set # CONFIG_INFINIBAND_HNS is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 7ec94d2d3..e739910cb 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2373,7 +2373,6 @@ CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_CXGB4=m CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 06b8e4b4e..e88d06b9c 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2133,7 +2133,6 @@ CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_HNS_HIP06 is not set # CONFIG_INFINIBAND_HNS_HIP08 is not set # CONFIG_INFINIBAND_HNS is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 054297fc3..a750c9228 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2370,7 +2370,6 @@ CONFIG_INFINIBAND_ADDR_TRANS=y # CONFIG_INFINIBAND_CXGB4 is not set CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 38fe7f6a2..5af875e79 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2132,7 +2132,6 @@ CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_HNS_HIP06 is not set # CONFIG_INFINIBAND_HNS_HIP08 is not set # CONFIG_INFINIBAND_HNS is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 958cfa92e..d369634c5 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2353,7 +2353,6 @@ CONFIG_INFINIBAND_ADDR_TRANS=y # CONFIG_INFINIBAND_CXGB4 is not set CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 8f3231842..41edf490e 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2116,7 +2116,6 @@ CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_HNS_HIP06 is not set # CONFIG_INFINIBAND_HNS_HIP08 is not set # CONFIG_INFINIBAND_HNS is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 6c99a01cb..fd39633ea 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2130,7 +2130,6 @@ CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_HNS_HIP06 is not set # CONFIG_INFINIBAND_HNS_HIP08 is not set # CONFIG_INFINIBAND_HNS is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 0f803471e..63cbfa252 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2605,7 +2605,6 @@ CONFIG_INFINIBAND_CXGB4=m CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set CONFIG_INFINIBAND_HFI1=m -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index b6147a04a..d7baf97b6 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2296,7 +2296,6 @@ CONFIG_INFINIBAND_HFI1=m # CONFIG_INFINIBAND_HNS_HIP06 is not set # CONFIG_INFINIBAND_HNS_HIP08 is not set # CONFIG_INFINIBAND_HNS is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index dbd6049f7..ae74c6749 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2588,7 +2588,6 @@ CONFIG_INFINIBAND_CXGB4=m CONFIG_INFINIBAND_EFA=m # CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set CONFIG_INFINIBAND_HFI1=m -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 8b3da741b..dec188f78 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2280,7 +2280,6 @@ CONFIG_INFINIBAND_HFI1=m # CONFIG_INFINIBAND_HNS_HIP06 is not set # CONFIG_INFINIBAND_HNS_HIP08 is not set # CONFIG_INFINIBAND_HNS is not set -CONFIG_INFINIBAND_I40IW=m CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y diff --git a/kernel.spec b/kernel.spec index 871ff80cb..31c2ba89b 100755 --- a/kernel.spec +++ b/kernel.spec @@ -80,7 +80,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc3.20210929gita4e6f95a891a.27 +%global distro_build 0.rc3.20210930git02d5e016800d.28 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -125,13 +125,13 @@ Summary: The Linux kernel %define rpmversion 5.15.0 %define patchversion 5.15 -%define pkgrelease 0.rc3.20210929gita4e6f95a891a.27 +%define pkgrelease 0.rc3.20210930git02d5e016800d.28 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20210929gita4e6f95a891a.27%{?buildid}%{?dist} +%define specrelease 0.rc3.20210930git02d5e016800d.28%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -672,7 +672,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-rc3-104-ga4e6f95a891a.tar.xz +Source0: linux-5.15-rc3-135-g02d5e016800d.tar.xz Source1: Makefile.rhelver @@ -1358,8 +1358,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-rc3-104-ga4e6f95a891a -c -mv linux-5.15-rc3-104-ga4e6f95a891a linux-%{KVERREL} +%setup -q -n kernel-5.15-rc3-135-g02d5e016800d -c +mv linux-5.15-rc3-135-g02d5e016800d linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2958,6 +2958,9 @@ fi # # %changelog +* Thu Sep 30 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc3.20210930git02d5e016800d.28] +- redhat/configs: Remove CONFIG_INFINIBAND_I40IW (Kamal Heib) + * Wed Sep 29 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc3.20210929gita4e6f95a891a.27] - cleanup CONFIG_X86_PLATFORM_DRIVERS_INTEL (David Arcari) - redhat: rename usage of .rhel8git.mk to .rhpkg.mk (Herton R. Krzesinski) @@ -1,3 +1,3 @@ -SHA512 (linux-5.15-rc3-104-ga4e6f95a891a.tar.xz) = c16778e5dbd515d2b61db5ef5f58abe7d94b221d52e39f87a66ef437c4077568da4789a3d7751e23b97dc3ec9422e40f96a0dae8eeff52d6ca803ced3b5f3b77 -SHA512 (kernel-abi-stablelists-5.15.0-0.rc3.20210929gita4e6f95a891a.27.tar.bz2) = b077b97f024c706b0e53b65cd887adccb22eec5e7066e6ecc434e5c1c100be4740d10da4489318a37295c82dd87c3fecc5b800cc26c96399cd80d0d9bcf109d4 -SHA512 (kernel-kabi-dw-5.15.0-0.rc3.20210929gita4e6f95a891a.27.tar.bz2) = b9abcb84d6c3296d3c0c528ade806bd2b0c79e9dd0b07b2ee61ad3302c1d00b58541938317098b21dbb9ae32b8c0e4acebb9fe527490638318f89c2feeea2829 +SHA512 (linux-5.15-rc3-135-g02d5e016800d.tar.xz) = 1c8216111188688aa9f5bfa3b66cf0bf16134e758a3faadc788d2fec77bde71aa880e503d746b11472e106fa1e819f348fd749547e0608452ce72affcada60b9 +SHA512 (kernel-abi-stablelists-5.15.0-0.rc3.20210930git02d5e016800d.28.tar.bz2) = 031ce0eafd97bf129077a6c0302cba9eea18c104d1ad54b9db0a618aa814c4d2b52a110d0ddb45adcb12139f3c688cb5fbe62a3ba6323f8662894b94a85e7518 +SHA512 (kernel-kabi-dw-5.15.0-0.rc3.20210930git02d5e016800d.28.tar.bz2) = de23b27e1d08a2773cf7b6d8da232821a58a02e357923666489ba30ed010b6b6de72fe79cb7905fe1ad2ba783c59945b0b8a0087e52a8614d6b9dcd8f2dba57c |