diff options
27 files changed, 74 insertions, 27 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index df4a3ee4e..f74bfc4ea 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 = 8 +RHEL_RELEASE = 9 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 98b3bca28..aabc9a53b 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -218,6 +218,7 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set CONFIG_AMD_XGBE_DCB=y CONFIG_AMD_XGBE=m @@ -3036,6 +3037,7 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 56b7ee034..3a91b0c67 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -176,6 +176,7 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMD_XGBE=m @@ -2423,6 +2424,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 5e7072ddf..e896b102e 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -218,6 +218,7 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set CONFIG_AMD_XGBE_DCB=y CONFIG_AMD_XGBE=m @@ -3020,6 +3021,7 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 5cdc0760c..0b2a50066 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -176,6 +176,7 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMD_XGBE=m @@ -2407,6 +2408,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index a7368d073..d42d9cc2c 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -215,6 +215,7 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set # CONFIG_AMIGA_PARTITION is not set @@ -3067,6 +3068,7 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 787846de6..0ecc39d04 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -215,6 +215,7 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set # CONFIG_AMIGA_PARTITION is not set @@ -3052,6 +3053,7 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 12cb44a56..b88b2ab60 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -213,6 +213,7 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set # CONFIG_AMIGA_PARTITION is not set @@ -3000,6 +3001,7 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index acc653a85..ce7b0a626 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -213,6 +213,7 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set # CONFIG_AMIGA_PARTITION is not set @@ -2985,6 +2986,7 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index f2fc7ccf1..7ba558852 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -233,6 +233,7 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set CONFIG_AMD_XGBE_DCB=y CONFIG_AMD_XGBE=m @@ -2678,6 +2679,7 @@ CONFIG_INTEL_CHT_INT33FE=m CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m CONFIG_INTEL_IDXD_PERFMON=y CONFIG_INTEL_IDXD_SVM=y diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 7ff240ba2..ace8a393e 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -233,6 +233,7 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set CONFIG_AMD_XGBE_DCB=y CONFIG_AMD_XGBE=m @@ -2661,6 +2662,7 @@ CONFIG_INTEL_CHT_INT33FE=m CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m CONFIG_INTEL_IDXD_PERFMON=y CONFIG_INTEL_IDXD_SVM=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index ed19f806e..698cd766f 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -206,6 +206,7 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set # CONFIG_AMIGA_PARTITION is not set @@ -2495,6 +2496,7 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 34752aa79..9d00a3967 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -169,6 +169,7 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set # CONFIG_ANDROID is not set @@ -2246,6 +2247,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index d0c9345c5..2cc2f7207 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -206,6 +206,7 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set # CONFIG_AMIGA_PARTITION is not set @@ -2478,6 +2479,7 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 61a221ca3..fc9b1ba1d 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -169,6 +169,7 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set # CONFIG_ANDROID is not set @@ -2230,6 +2231,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 2ddd4c147..99b2b9d6c 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -206,6 +206,7 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set # CONFIG_AMIGA_PARTITION is not set @@ -2474,6 +2475,7 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index d0b283933..65d17fe69 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -166,6 +166,7 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set # CONFIG_ANDROID is not set @@ -2229,6 +2230,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index ceb80a143..34cce5376 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -206,6 +206,7 @@ CONFIG_AMD8111_ETH=m # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set # CONFIG_AMIGA_PARTITION is not set @@ -2457,6 +2458,7 @@ CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 3419f80c0..4080b3ead 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -166,6 +166,7 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set # CONFIG_ANDROID is not set @@ -2213,6 +2214,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index e8ae69bb3..217d9fe52 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -166,6 +166,7 @@ CONFIG_ALX=m # CONFIG_AMD_IOMMU_DEBUGFS is not set # CONFIG_AMD_PHY is not set CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set # CONFIG_ANDROID is not set @@ -2231,6 +2232,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 9e881bbb4..e4dc4e4de 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -240,6 +240,7 @@ CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set CONFIG_AMD_XGBE_DCB=y @@ -2726,6 +2727,7 @@ CONFIG_INTEL_CHT_INT33FE=m CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m CONFIG_INTEL_IDXD_PERFMON=y CONFIG_INTEL_IDXD_SVM=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 3a0b6fd6c..e903d143c 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -188,6 +188,7 @@ CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set @@ -2399,6 +2400,7 @@ CONFIG_INTEGRITY=y CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m CONFIG_INTEL_IDXD_PERFMON=y CONFIG_INTEL_IDXD_SVM=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index c905aa2af..9e9683899 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -240,6 +240,7 @@ CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set CONFIG_AMD_XGBE_DCB=y @@ -2709,6 +2710,7 @@ CONFIG_INTEL_CHT_INT33FE=m CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m CONFIG_INTEL_IDXD_PERFMON=y CONFIG_INTEL_IDXD_SVM=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 17e4297cb..cd3dc2284 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -188,6 +188,7 @@ CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m +# CONFIG_AMD_PTDMA is not set CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set @@ -2383,6 +2384,7 @@ CONFIG_INTEGRITY=y CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m +# CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m CONFIG_INTEL_IDXD_PERFMON=y CONFIG_INTEL_IDXD_SVM=y diff --git a/kernel.spec b/kernel.spec index d44f1fff1..ddbb7efd0 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.rc0.20210909gita3fa7a101dcf.8 +%global distro_build 0.rc0.20210910gitbf9f243f23e6.9 %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.rc0.20210909gita3fa7a101dcf.8 +%define pkgrelease 0.rc0.20210910gitbf9f243f23e6.9 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20210909gita3fa7a101dcf.8%{?buildid}%{?dist} +%define specrelease 0.rc0.20210910gitbf9f243f23e6.9%{?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.14-10557-ga3fa7a101dcf.tar.xz +Source0: linux-5.14-10807-gbf9f243f23e6.tar.xz Source1: Makefile.rhelver @@ -1358,8 +1358,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-10557-ga3fa7a101dcf -c -mv linux-5.14-10557-ga3fa7a101dcf linux-%{KVERREL} +%setup -q -n kernel-5.14-10807-gbf9f243f23e6 -c +mv linux-5.14-10807-gbf9f243f23e6 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2958,12 +2958,13 @@ fi # # %changelog -* Thu Sep 09 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-0.rc0.20210909gita3fa7a101dcf.8] -- Fixup IOMMU configs in pending so that configs are sane again (Justin M. Forbes) - -* Thu Sep 09 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc0.20210909gita3fa7a101dcf.8] +* Fri Sep 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc0.20210910gitbf9f243f23e6.9] - Temporarily stop building perf with LIBBPF_DYNAMIC=1 (Justin M. Forbes) +* Fri Sep 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc0.20210910gitbf9f243f23e6.8] +- Update CONFIG_WERROR to disabled as it can cause issue with out of tree modules. (Justin M. Forbes) +- Fixup IOMMU configs in pending so that configs are sane again (Justin M. Forbes) + * Wed Sep 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc0.20210908gitac08b1c68d1b.6] - Some initial Fedora config items for 5.15 (Justin M. Forbes) diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch index 6f694a1a9..02b5f6d33 100644 --- a/patch-5.15-redhat.patch +++ b/patch-5.15-redhat.patch @@ -88,10 +88,10 @@ 87 files changed, 1359 insertions(+), 1523 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 828d11441ebf..208262916a11 100644 +index 91ba391f9b32..88296cfdc5e5 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5887,6 +5887,15 @@ +@@ -5892,6 +5892,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -171,10 +171,10 @@ index 2d1e491f7737..b056845109e5 100644 $(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 99863022436d..fb0fe0b06efe 100644 +index fc196421b2ce..0a6b267128ae 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1470,9 +1470,9 @@ config HIGHMEM +@@ -1469,9 +1469,9 @@ config HIGHMEM If unsure, say n. config HIGHPTE @@ -273,7 +273,7 @@ index e2cc35775b99..96fc8134f056 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 5a01872f5984..dde96de11a17 100644 +index 67e5fff96ee0..0d58c1f07176 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -282,9 +282,9 @@ index 5a01872f5984..dde96de11a17 100644 #include <linux/start_kernel.h> +#include <linux/security.h> #include <linux/hugetlb.h> + #include <linux/kmemleak.h> - #include <asm/boot_data.h> -@@ -977,6 +978,9 @@ void __init setup_arch(char **cmdline_p) +@@ -981,6 +982,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); @@ -2069,10 +2069,10 @@ index 86658a81d284..5647f4756e97 100644 * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index 136940af00b8..c3a0bbebcba7 100644 +index 0775950ee84e..1a3e0b7dd7dc 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -4291,6 +4291,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) +@@ -4292,6 +4292,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) set_bit(EXT4_FLAGS_BDEV_IS_DAX, &sbi->s_ext4_flags); if (sbi->s_mount_opt & EXT4_MOUNT_DAX_ALWAYS) { @@ -2080,7 +2080,7 @@ index 136940af00b8..c3a0bbebcba7 100644 if (ext4_has_feature_inline_data(sb)) { ext4_msg(sb, KERN_ERR, "Cannot use DAX on a filesystem" " that may contain inline data"); -@@ -4301,6 +4302,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) +@@ -4302,6 +4303,10 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) "DAX unsupported by block device."); goto failed_mount; } @@ -2092,10 +2092,10 @@ index 136940af00b8..c3a0bbebcba7 100644 if (ext4_has_feature_encrypt(sb) && es->s_encryption_level) { diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c -index 9a86d3ec2cb6..f3828cb07b9e 100644 +index c4e0cd1c1c8c..f80fa9b6d53e 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c -@@ -1584,6 +1584,7 @@ xfs_fs_fill_super( +@@ -1593,6 +1593,7 @@ xfs_fs_fill_super( if (xfs_has_dax_always(mp)) { bool rtdev_is_dax = false, datadev_is_dax; @@ -2103,7 +2103,7 @@ index 9a86d3ec2cb6..f3828cb07b9e 100644 xfs_warn(mp, "DAX enabled. Warning: EXPERIMENTAL, use at your own risk"); -@@ -1604,6 +1605,10 @@ xfs_fs_fill_super( +@@ -1612,6 +1613,10 @@ xfs_fs_fill_super( error = -EINVAL; goto out_filestream_unmount; } @@ -1,3 +1,3 @@ -SHA512 (linux-5.14-10557-ga3fa7a101dcf.tar.xz) = c95a84a85b9e53ad6e6a3208c4a2d5956e967cd64b092dffc0f7700117628ce1adfe2222d0abd42fb02b8442b7e81ec0625719ab5cf70794460be016fe74cbde -SHA512 (kernel-abi-stablelists-5.15.0-0.rc0.20210909gita3fa7a101dcf.8.tar.bz2) = 5999696882851d9eab24efa2af62506efd2e27ce10d615d8a7df1b07662a8ce4f93eb902b24ff1955d699480a7331f35dc5a3db85fee192ddd359f37e0c8cfbe -SHA512 (kernel-kabi-dw-5.15.0-0.rc0.20210909gita3fa7a101dcf.8.tar.bz2) = 261fa865d09f834eff1a118846370a98eb4d51aade9e4096210065a585b9ee51a7a6e023e4e306483449c4e2494ae4ae4db0b392c91a24bb59fa57ff6dd86351 +SHA512 (linux-5.14-10807-gbf9f243f23e6.tar.xz) = 035ea867189f52339b3ec83d8b3296670c7d9cf56521ef25c79a8366d6c03793f2ef9d619eba9260f01088a26c576d9b4354a56c3e458f1fa0faba948e7e2223 +SHA512 (kernel-abi-stablelists-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.tar.bz2) = 28d6abc1362262a32557de9d3c6c298f2a751cd7b0ff6b357e6697dfe9e50c31bcbbce9c65b69f2eef75a54b6573aacc726e249f7b58e960e2f7e28b87bdf589 +SHA512 (kernel-kabi-dw-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.tar.bz2) = ba4ace2990a14f90a15d24b1972e82549de062ffba2db29d1412c50d1eb9c9dcd1845aebb0b5dfd4eda4e9b7763bfa030fb7f18fa52ea35856f438a1c84605f9 |