From cbc42e18f58156417664a29cd6c981196a1d6c30 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 5 May 2021 11:43:48 -0500 Subject: kernel-5.13.0-0.rc0.20210505gitd665ea6ea86c.8 * Wed May 05 2021 Fedora Kernel Team [5.13.0-0.rc0.20210505gitd665ea6ea86c.8] - Flip CONFIG_USB_ROLE_SWITCH from m to y (Justin M. Forbes) - Set valid options for CONFIG_FW_LOADER_USER_HELPER (Justin M. Forbes) - Clean up CONFIG_FB_MODE_HELPERS (Justin M. Forbes) - Turn off CONFIG_VFIO for the s390x zfcpdump kernel (Justin M. Forbes) - Delete unused CONFIG_SND_SOC_MAX98390 pending-common (Justin M. Forbes) - Update pending-common configs, preparing to set correctly (Justin M. Forbes) - Update fedora filters for surface (Justin M. Forbes) - Build CONFIG_CRYPTO_ECDSA inline for s390x zfcpdump (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- filter-modules.sh.fedora | 8 ++++++++ kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-debug-rhel.config | 6 +++--- kernel-aarch64-fedora.config | 2 +- kernel-aarch64-rhel.config | 6 +++--- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- kernel-i686-debug-fedora.config | 2 +- kernel-i686-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-debug-rhel.config | 6 +++--- kernel-ppc64le-fedora.config | 2 +- kernel-ppc64le-rhel.config | 6 +++--- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-debug-rhel.config | 6 +++--- kernel-s390x-fedora.config | 2 +- kernel-s390x-rhel.config | 6 +++--- kernel-s390x-zfcpdump-rhel.config | 6 +++--- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-debug-rhel.config | 6 +++--- kernel-x86_64-fedora.config | 2 +- kernel-x86_64-rhel.config | 6 +++--- kernel.spec | 22 ++++++++++++++++------ patch-5.13.0-redhat.patch | 4 ++-- sources | 6 +++--- 28 files changed, 71 insertions(+), 53 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index cca8dcf56..df4a3ee4e 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 = 7 +RHEL_RELEASE = 8 # # Early y+1 numbering diff --git a/filter-modules.sh.fedora b/filter-modules.sh.fedora index 5ad908ad0..9a708e38a 100755 --- a/filter-modules.sh.fedora +++ b/filter-modules.sh.fedora @@ -27,6 +27,8 @@ ethdrvs="3com adaptec alteon amd aquantia atheros broadcom cadence calxeda chels inputdrvs="gameport tablet touchscreen" +hiddrvs="surface-hid" + scsidrvs="aacraid aic7xxx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2r fcoe fnic isci libsas lpfc megaraid mpt3sas mvsas pm8001 qla2xxx qla4xxx sym53c8xx_2 ufs qedf" usbdrvs="atm image misc serial" @@ -112,6 +114,12 @@ do filter_dir $1 drivers/input/${input} done +# hid +for hid in ${hiddrvs} +do + filter_dir $1 drivers/hid/${hid} +done + # USB for usb in ${usbdrvs} do diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 37d646e5e..abd7e6583 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2989,6 +2989,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_VIRTIO is not set @@ -6739,7 +6740,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 74a37cbdf..729c24340 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -729,7 +729,7 @@ CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_HUGETLB=y -# CONFIG_CGROUP_MISC is not set +CONFIG_CGROUP_MISC=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_PERF=y @@ -1744,7 +1744,7 @@ CONFIG_FUTEX=y CONFIG_FW_CFG_SYSFS=y CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_FW_LOADER=y CONFIG_FWTTY_MAX_CARD_PORTS=32 CONFIG_FWTTY_MAX_TOTAL_PORTS=64 @@ -2354,6 +2354,7 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -5359,7 +5360,6 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y # CONFIG_SND_SOC_MAX9759 is not set # CONFIG_SND_SOC_MAX98088 is not set CONFIG_SND_SOC_MAX98373=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MAX9867 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index c47837bab..9224a544c 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2973,6 +2973,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_VIRTIO is not set @@ -6715,7 +6716,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index d09b6f875..0dcbb33d0 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -729,7 +729,7 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_HUGETLB=y -# CONFIG_CGROUP_MISC is not set +CONFIG_CGROUP_MISC=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_PERF=y @@ -1728,7 +1728,7 @@ CONFIG_FUTEX=y CONFIG_FW_CFG_SYSFS=y CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_FW_LOADER=y CONFIG_FWTTY_MAX_CARD_PORTS=32 CONFIG_FWTTY_MAX_TOTAL_PORTS=64 @@ -2338,6 +2338,7 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -5337,7 +5338,6 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y # CONFIG_SND_SOC_MAX9759 is not set # CONFIG_SND_SOC_MAX98088 is not set CONFIG_SND_SOC_MAX98373=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MAX9867 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 1b292cf7f..284e86470 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -3024,6 +3024,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_VIRTIO is not set @@ -6904,7 +6905,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 1bb0048c1..4ce7c3a86 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -3009,6 +3009,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_VIRTIO is not set @@ -6881,7 +6882,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index a108e62f6..9388b9615 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2957,6 +2957,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_VIRTIO is not set @@ -6698,7 +6699,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 5745741b7..841c66dd5 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2942,6 +2942,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_VIRTIO is not set @@ -6675,7 +6676,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index f7d45bc7a..36ad66935 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -2638,6 +2638,7 @@ CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set CONFIG_INTEL_IDXD_SVM=y # CONFIG_INTEL_INT0002_VGPIO is not set CONFIG_INTEL_IOATDMA=m @@ -6095,7 +6096,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 7768499bb..2365796c1 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -2621,6 +2621,7 @@ CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set CONFIG_INTEL_IDXD_SVM=y # CONFIG_INTEL_INT0002_VGPIO is not set CONFIG_INTEL_IOATDMA=m @@ -6072,7 +6073,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index c6be03451..feb3b1f1b 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2451,6 +2451,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_VIRTIO is not set @@ -5726,7 +5727,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 51e9c22f7..e1d7eca39 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -611,7 +611,7 @@ CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_HUGETLB=y -# CONFIG_CGROUP_MISC is not set +CONFIG_CGROUP_MISC=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_PERF=y @@ -1600,7 +1600,7 @@ CONFIG_FUTEX=y CONFIG_FW_CFG_SYSFS=y CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_FW_LOADER=y CONFIG_FWTTY_MAX_CARD_PORTS=32 CONFIG_FWTTY_MAX_TOTAL_PORTS=64 @@ -2199,6 +2199,7 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -5174,7 +5175,6 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y # CONFIG_SND_SOC_MAX9759 is not set # CONFIG_SND_SOC_MAX98088 is not set CONFIG_SND_SOC_MAX98373=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MAX9867 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 18afc1d2a..12de9ba4b 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2434,6 +2434,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_VIRTIO is not set @@ -5702,7 +5703,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index fa62ccd63..d426bddc0 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -611,7 +611,7 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_HUGETLB=y -# CONFIG_CGROUP_MISC is not set +CONFIG_CGROUP_MISC=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_PERF=y @@ -1584,7 +1584,7 @@ CONFIG_FUTEX=y CONFIG_FW_CFG_SYSFS=y CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_FW_LOADER=y CONFIG_FWTTY_MAX_CARD_PORTS=32 CONFIG_FWTTY_MAX_TOTAL_PORTS=64 @@ -2183,6 +2183,7 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -5156,7 +5157,6 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y # CONFIG_SND_SOC_MAX9759 is not set # CONFIG_SND_SOC_MAX98088 is not set CONFIG_SND_SOC_MAX98373=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MAX9867 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index e69cdd1e4..fa3ca91ea 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2432,6 +2432,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_VIRTIO is not set @@ -5670,7 +5671,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 03cf395d8..bd3a8fc9c 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -613,7 +613,7 @@ CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_HUGETLB=y -# CONFIG_CGROUP_MISC is not set +CONFIG_CGROUP_MISC=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_PERF=y @@ -1601,7 +1601,7 @@ CONFIG_FUTEX=y CONFIG_FW_CFG_SYSFS=y CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_FW_LOADER=y CONFIG_FWTTY_MAX_CARD_PORTS=32 CONFIG_FWTTY_MAX_TOTAL_PORTS=64 @@ -2178,6 +2178,7 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -5116,7 +5117,6 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y # CONFIG_SND_SOC_MAX9759 is not set # CONFIG_SND_SOC_MAX98088 is not set CONFIG_SND_SOC_MAX98373=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MAX9867 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 8fdc17f1d..653c705e3 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2415,6 +2415,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set # CONFIG_INTEL_LDMA is not set # CONFIG_INTEL_MEI_VIRTIO is not set @@ -5646,7 +5647,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 377c939c3..427c02ed8 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -613,7 +613,7 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_HUGETLB=y -# CONFIG_CGROUP_MISC is not set +CONFIG_CGROUP_MISC=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_PERF=y @@ -1585,7 +1585,7 @@ CONFIG_FUTEX=y CONFIG_FW_CFG_SYSFS=y CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_FW_LOADER=y CONFIG_FWTTY_MAX_CARD_PORTS=32 CONFIG_FWTTY_MAX_TOTAL_PORTS=64 @@ -2162,6 +2162,7 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -5098,7 +5099,6 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y # CONFIG_SND_SOC_MAX9759 is not set # CONFIG_SND_SOC_MAX98088 is not set CONFIG_SND_SOC_MAX98373=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MAX9867 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 4d75bdd30..07b876b08 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -618,7 +618,7 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_HUGETLB=y -# CONFIG_CGROUP_MISC is not set +CONFIG_CGROUP_MISC=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_PERF=y @@ -1597,7 +1597,7 @@ CONFIG_FUTEX=y CONFIG_FW_CFG_SYSFS=y CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_FW_LOADER=y CONFIG_FWTTY_MAX_CARD_PORTS=32 CONFIG_FWTTY_MAX_TOTAL_PORTS=64 @@ -2181,6 +2181,7 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -5127,7 +5128,6 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y # CONFIG_SND_SOC_MAX9759 is not set # CONFIG_SND_SOC_MAX98088 is not set CONFIG_SND_SOC_MAX98373=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MAX9867 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index a08661408..850b9759d 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2685,6 +2685,7 @@ CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set CONFIG_INTEL_IDXD_SVM=y CONFIG_INTEL_INT0002_VGPIO=m CONFIG_INTEL_IOATDMA=m @@ -6145,7 +6146,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 12b356895..fd7d7c9b5 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -638,7 +638,7 @@ CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_HUGETLB=y -# CONFIG_CGROUP_MISC is not set +CONFIG_CGROUP_MISC=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_PERF=y @@ -1602,7 +1602,7 @@ CONFIG_FB_HYPERV=m # CONFIG_FB_MATROX_MYSTIQUE is not set # CONFIG_FB_MB862XX is not set # CONFIG_FB_METRONOME is not set -CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_N411 is not set # CONFIG_FB_NEOMAGIC is not set CONFIG_FB_NVIDIA_BACKLIGHT=y @@ -2342,6 +2342,7 @@ CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set CONFIG_INTEL_IDXD_SVM=y # CONFIG_INTEL_INT0002_VGPIO is not set CONFIG_INTEL_IOATDMA=m @@ -5365,7 +5366,6 @@ CONFIG_SND_SOC=m # CONFIG_SND_SOC_MAX9759 is not set # CONFIG_SND_SOC_MAX98088 is not set CONFIG_SND_SOC_MAX98373=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MAX9867 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index bf64504b8..84aa7b7cc 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2668,6 +2668,7 @@ CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set CONFIG_INTEL_IDXD_SVM=y CONFIG_INTEL_INT0002_VGPIO=m CONFIG_INTEL_IOATDMA=m @@ -6122,7 +6123,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_SDW=m CONFIG_SND_SOC_MAX98390=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 57c6ed205..37de06600 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -638,7 +638,7 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_HUGETLB=y -# CONFIG_CGROUP_MISC is not set +CONFIG_CGROUP_MISC=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_PERF=y @@ -1586,7 +1586,7 @@ CONFIG_FB_HYPERV=m # CONFIG_FB_MATROX_MYSTIQUE is not set # CONFIG_FB_MB862XX is not set # CONFIG_FB_METRONOME is not set -CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_N411 is not set # CONFIG_FB_NEOMAGIC is not set CONFIG_FB_NVIDIA_BACKLIGHT=y @@ -2326,6 +2326,7 @@ CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set CONFIG_INTEL_IDXD_SVM=y # CONFIG_INTEL_INT0002_VGPIO is not set CONFIG_INTEL_IOATDMA=m @@ -5344,7 +5345,6 @@ CONFIG_SND_SOC=m # CONFIG_SND_SOC_MAX9759 is not set # CONFIG_SND_SOC_MAX98088 is not set CONFIG_SND_SOC_MAX98373=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MAX9867 is not set diff --git a/kernel.spec b/kernel.spec index 663614c70..c21d6e410 100755 --- a/kernel.spec +++ b/kernel.spec @@ -66,7 +66,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc0.20210504git5e321ded302d.7 +%global distro_build 0.rc0.20210505gitd665ea6ea86c.8 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -107,13 +107,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.13.0 -%define pkgrelease 0.rc0.20210504git5e321ded302d.7 +%define pkgrelease 0.rc0.20210505gitd665ea6ea86c.8 # This is needed to do merge window version magic %define patchlevel 13 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20210504git5e321ded302d.7%{?buildid}%{?dist} +%define specrelease 0.rc0.20210505gitd665ea6ea86c.8%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -618,7 +618,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.12-13670-g5e321ded302d.tar.xz +Source0: linux-5.12-13882-gd665ea6ea86c.tar.xz Source1: Makefile.rhelver @@ -1268,8 +1268,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.12-13670-g5e321ded302d -c -mv linux-5.12-13670-g5e321ded302d linux-%{KVERREL} +%setup -q -n kernel-5.12-13882-gd665ea6ea86c -c +mv linux-5.12-13882-gd665ea6ea86c linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2779,6 +2779,16 @@ fi # # %changelog +* Wed May 05 2021 Fedora Kernel Team [5.13.0-0.rc0.20210505gitd665ea6ea86c.8] +- Flip CONFIG_USB_ROLE_SWITCH from m to y (Justin M. Forbes) +- Set valid options for CONFIG_FW_LOADER_USER_HELPER (Justin M. Forbes) +- Clean up CONFIG_FB_MODE_HELPERS (Justin M. Forbes) +- Turn off CONFIG_VFIO for the s390x zfcpdump kernel (Justin M. Forbes) +- Delete unused CONFIG_SND_SOC_MAX98390 pending-common (Justin M. Forbes) +- Update pending-common configs, preparing to set correctly (Justin M. Forbes) +- Update fedora filters for surface (Justin M. Forbes) +- Build CONFIG_CRYPTO_ECDSA inline for s390x zfcpdump (Justin M. Forbes) + * Tue May 04 2021 Fedora Kernel Team [5.13.0-0.rc0.20210504git5e321ded302d.7] - Fix branch creation for releases based on tags (Jeremy Cline) - Replace "flavour" where "variant" is meant instead (David Ward) diff --git a/patch-5.13.0-redhat.patch b/patch-5.13.0-redhat.patch index 5f4f6c931..527604a15 100644 --- a/patch-5.13.0-redhat.patch +++ b/patch-5.13.0-redhat.patch @@ -1969,10 +1969,10 @@ index 8100bb477d86..f758f2869c02 100644 /* Exported symbols */ diff --git a/include/linux/pci.h b/include/linux/pci.h -index 0fa104ee13d9..09701ace3928 100644 +index 413ece666bf9..b53f1f41e42c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1431,6 +1431,10 @@ int pci_add_dynid(struct pci_driver *drv, +@@ -1432,6 +1432,10 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data); const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); diff --git a/sources b/sources index ece15eafb..9ec5031e1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.12-13670-g5e321ded302d.tar.xz) = 1a23211c344c834a4aae0db5a24d10d182d937de8d971c0b0481f1c8efbc6f9b979a4f35a217e08f5f9c858994f6844f8dd5cd5bef837bda2ca5da88a397f89f -SHA512 (kernel-abi-whitelists-5.13.0-0.rc0.20210504git5e321ded302d.7.tar.bz2) = 732358bc49868b1426394411bc504ea71707107390f8ee309d8801838704288d467f0d61feebb2613e4a7df1984d1d72eed9bbdd093f112f41e21967069d9b68 -SHA512 (kernel-kabi-dw-5.13.0-0.rc0.20210504git5e321ded302d.7.tar.bz2) = fdcce1cb953b059941351c09274feaa98053d2d3153a46708824996d2f38eac6d8eee8dd92165521e90e1b03bf1fedc73f29401e268b2dbf83feac1afba8afc3 +SHA512 (linux-5.12-13882-gd665ea6ea86c.tar.xz) = 87dd8fefdd98f285c85e50a85d3382168cb468441b808190f324561c8d7bd6db1ab821c00cd78a0cf3f8b0569118c43cef43582bddbf864b365bafa68aad1f6e +SHA512 (kernel-abi-whitelists-5.13.0-0.rc0.20210505gitd665ea6ea86c.8.tar.bz2) = 0fcc3a0a3c07cee3c7ac9debe71cefa6d13ecb9f1dbaeaca4f4e277b469ac02e010100c9e3bd3ffc7d35194c9b5189e3bc8772f2ee139cb4f2e39e18a6e32a24 +SHA512 (kernel-kabi-dw-5.13.0-0.rc0.20210505gitd665ea6ea86c.8.tar.bz2) = 6adc0f85f830542792dba68a78dc8d1bdf0fb6e0d96033f189e1f8469dc90b77bbcb405b2a6464530e85a2258902490ce48276722e7b9b6da560af9cc20432a0 -- cgit From cb37c2b6e7479b9c90496c7bf0f8bd06295f30c0 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 6 May 2021 09:11:24 -0500 Subject: kernel-5.13.0-0.rc0.20210506git8404c9fbc84b.9 * Thu May 06 2021 Fedora Kernel Team [5.13.0-0.rc0.20210506git8404c9fbc84b.9] - Keep CONFIG_KASAN_HW_TAGS off for aarch64 debug configs (Justin M. Forbes) - New configs in drivers/bus (Fedora Kernel Team) - RHEL: Don't build KVM PR module on ppc64 (David Gibson) [1930649] Resolves: rhbz#1930649 Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 4 ++++ kernel-aarch64-debug-rhel.config | 6 +++++- kernel-aarch64-fedora.config | 4 ++++ kernel-aarch64-rhel.config | 6 +++++- kernel-armv7hl-debug-fedora.config | 4 ++++ kernel-armv7hl-fedora.config | 4 ++++ kernel-armv7hl-lpae-debug-fedora.config | 4 ++++ kernel-armv7hl-lpae-fedora.config | 4 ++++ kernel-i686-debug-fedora.config | 5 ++++- kernel-i686-fedora.config | 5 ++++- kernel-ppc64le-debug-fedora.config | 5 ++++- kernel-ppc64le-debug-rhel.config | 9 ++++++--- kernel-ppc64le-fedora.config | 5 ++++- kernel-ppc64le-rhel.config | 9 ++++++--- kernel-s390x-debug-fedora.config | 5 ++++- kernel-s390x-debug-rhel.config | 7 +++++-- kernel-s390x-fedora.config | 5 ++++- kernel-s390x-rhel.config | 7 +++++-- kernel-s390x-zfcpdump-rhel.config | 7 +++++-- kernel-x86_64-debug-fedora.config | 5 ++++- kernel-x86_64-debug-rhel.config | 7 +++++-- kernel-x86_64-fedora.config | 5 ++++- kernel-x86_64-rhel.config | 7 +++++-- kernel.spec | 18 ++++++++++++------ patch-5.13.0-redhat.patch | 22 +++++++++++----------- sources | 6 +++--- 27 files changed, 130 insertions(+), 47 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 abd7e6583..ce28f8ae3 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1106,6 +1106,7 @@ CONFIG_CMA_SIZE_MBYTES=64 CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y CONFIG_CMDLINE="" # CONFIG_CMDLINE_EXTEND is not set @@ -3001,6 +3002,7 @@ CONFIG_INTEL_IDXD=m CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_SOC_PMIC is not set CONFIG_INTEL_STRATIX10_SERVICE=m +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set @@ -8017,6 +8019,7 @@ CONFIG_VCNL4000=m CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y +# CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDSO=y @@ -8264,6 +8267,7 @@ CONFIG_VMAP_STACK=y CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 729c24340..0e91e8cb4 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -812,6 +812,7 @@ CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set # CONFIG_CMA is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMDLINE="console=ttyAMA0" # CONFIG_CMDLINE_EXTEND is not set # CONFIG_CMDLINE_FORCE is not set @@ -1081,7 +1082,8 @@ CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set # CONFIG_CX_ECAT is not set CONFIG_CXL_BIMODAL=y -# CONFIG_CXL_BUS is not set +CONFIG_CXL_BUS=y +# CONFIG_CXL_MEM is not set CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DA280 is not set @@ -2379,6 +2381,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SOC_PMIC_CHTWC is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_STRATIX10_SERVICE is not set +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m @@ -6470,6 +6473,7 @@ CONFIG_VMAP_STACK=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 9224a544c..fdccbb5ff 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1106,6 +1106,7 @@ CONFIG_CMA_SIZE_MBYTES=64 CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y CONFIG_CMDLINE="" # CONFIG_CMDLINE_EXTEND is not set @@ -2985,6 +2986,7 @@ CONFIG_INTEL_IDXD=m CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_SOC_PMIC is not set CONFIG_INTEL_STRATIX10_SERVICE=m +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set @@ -7992,6 +7994,7 @@ CONFIG_VCNL4000=m CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y +# CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDSO=y @@ -8239,6 +8242,7 @@ CONFIG_VMAP_STACK=y CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 0dcbb33d0..68fa1a482 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -812,6 +812,7 @@ CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set # CONFIG_CMA is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMDLINE="console=ttyAMA0" # CONFIG_CMDLINE_EXTEND is not set # CONFIG_CMDLINE_FORCE is not set @@ -1081,7 +1082,8 @@ CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set # CONFIG_CX_ECAT is not set CONFIG_CXL_BIMODAL=y -# CONFIG_CXL_BUS is not set +CONFIG_CXL_BUS=y +# CONFIG_CXL_MEM is not set CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DA280 is not set @@ -2363,6 +2365,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SOC_PMIC_CHTWC is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_STRATIX10_SERVICE is not set +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m @@ -6447,6 +6450,7 @@ CONFIG_VMAP_STACK=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 284e86470..f02dba1bd 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1129,6 +1129,7 @@ CONFIG_CMA_SIZE_MBYTES=64 CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y CONFIG_CMDLINE="" # CONFIG_CMDLINE_EXTEND is not set @@ -3036,6 +3037,7 @@ CONFIG_INTEL_IDXD=m CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_SOC_PMIC is not set CONFIG_INTEL_STRATIX10_SERVICE=m +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set @@ -8276,6 +8278,7 @@ CONFIG_VCNL3020=m CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y +# CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m # CONFIG_VDSO is not set @@ -8551,6 +8554,7 @@ CONFIG_VLAN_8021Q_MVRP=y CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 4ce7c3a86..e6e1730e2 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1129,6 +1129,7 @@ CONFIG_CMA_SIZE_MBYTES=64 CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y CONFIG_CMDLINE="" # CONFIG_CMDLINE_EXTEND is not set @@ -3021,6 +3022,7 @@ CONFIG_INTEL_IDXD=m CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_SOC_PMIC is not set CONFIG_INTEL_STRATIX10_SERVICE=m +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set @@ -8252,6 +8254,7 @@ CONFIG_VCNL3020=m CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y +# CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m # CONFIG_VDSO is not set @@ -8527,6 +8530,7 @@ CONFIG_VLAN_8021Q_MVRP=y CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 9388b9615..e6599c8b6 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1102,6 +1102,7 @@ CONFIG_CMA_SIZE_MBYTES=64 CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y CONFIG_CMDLINE="" # CONFIG_CMDLINE_EXTEND is not set @@ -2969,6 +2970,7 @@ CONFIG_INTEL_IDXD=m CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_SOC_PMIC is not set CONFIG_INTEL_STRATIX10_SERVICE=m +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set @@ -8020,6 +8022,7 @@ CONFIG_VCNL3020=m CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y +# CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDSO=y @@ -8282,6 +8285,7 @@ CONFIG_VLAN_8021Q_MVRP=y CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 841c66dd5..bca0cce23 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1102,6 +1102,7 @@ CONFIG_CMA_SIZE_MBYTES=64 CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y CONFIG_CMDLINE="" # CONFIG_CMDLINE_EXTEND is not set @@ -2954,6 +2955,7 @@ CONFIG_INTEL_IDXD=m CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_SOC_PMIC is not set CONFIG_INTEL_STRATIX10_SERVICE=m +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set @@ -7996,6 +7998,7 @@ CONFIG_VCNL3020=m CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y +# CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VDSO=y @@ -8258,6 +8261,7 @@ CONFIG_VLAN_8021Q_MVRP=y CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 36ad66935..049875733 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -904,6 +904,7 @@ CONFIG_CMA_SIZE_MBYTES=0 CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMDLINE="" # CONFIG_CMDLINE_BOOL is not set # CONFIG_CMDLINE_EXTEND is not set @@ -2682,6 +2683,7 @@ CONFIG_INTEL_SOC_PMIC_MRFLD=m CONFIG_INTEL_SOC_PMIC=y CONFIG_INTEL_SPEED_SELECT_INTERFACE=m CONFIG_INTEL_STRATIX10_SERVICE=m +# CONFIG_INTEL_TCC_COOLING is not set CONFIG_INTEL_TELEMETRY=m CONFIG_INTEL_TH_ACPI=m # CONFIG_INTEL_TH_DEBUG is not set @@ -7199,12 +7201,12 @@ CONFIG_VCNL3020=m CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y +# CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y # CONFIG_VF610_ADC is not set # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m @@ -7423,6 +7425,7 @@ CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m CONFIG_VORTEX=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 2365796c1..57976d4d7 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -903,6 +903,7 @@ CONFIG_CMA_SIZE_MBYTES=0 CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMDLINE="" # CONFIG_CMDLINE_BOOL is not set # CONFIG_CMDLINE_EXTEND is not set @@ -2665,6 +2666,7 @@ CONFIG_INTEL_SOC_PMIC_MRFLD=m CONFIG_INTEL_SOC_PMIC=y CONFIG_INTEL_SPEED_SELECT_INTERFACE=m CONFIG_INTEL_STRATIX10_SERVICE=m +# CONFIG_INTEL_TCC_COOLING is not set CONFIG_INTEL_TELEMETRY=m CONFIG_INTEL_TH_ACPI=m # CONFIG_INTEL_TH_DEBUG is not set @@ -7175,12 +7177,12 @@ CONFIG_VCNL3020=m CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y +# CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y # CONFIG_VF610_ADC is not set # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m @@ -7399,6 +7401,7 @@ CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m CONFIG_VORTEX=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index feb3b1f1b..c05538d0a 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -852,6 +852,7 @@ CONFIG_CM3605=m CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y CONFIG_CMDLINE="" # CONFIG_CMDLINE_BOOL is not set @@ -2463,6 +2464,7 @@ CONFIG_INTEL_IDXD=m CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_SOC_PMIC is not set CONFIG_INTEL_STRATIX10_SERVICE=m +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set @@ -6785,12 +6787,12 @@ CONFIG_VCNL3020=m CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y +# CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y # CONFIG_VF610_ADC is not set # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m @@ -6997,6 +6999,7 @@ CONFIG_VLAN_8021Q_MVRP=y CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index e1d7eca39..1193fa3e0 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -690,6 +690,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y CONFIG_CMDLINE="" # CONFIG_CMDLINE_BOOL is not set @@ -934,10 +935,11 @@ CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set # CONFIG_CX_ECAT is not set CONFIG_CXL_BIMODAL=y -# CONFIG_CXL_BUS is not set +CONFIG_CXL_BUS=y CONFIG_CXLFLASH=m CONFIG_CXL_LIB=y CONFIG_CXL=m +# CONFIG_CXL_MEM is not set CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DA280 is not set @@ -2224,6 +2226,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SOC_PMIC_CHTWC is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_STRATIX10_SERVICE is not set +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m @@ -2562,7 +2565,7 @@ CONFIG_KSM=y CONFIG_KVM_AMD_SEV=y CONFIG_KVM_BOOK3S_64_HV=m CONFIG_KVM_BOOK3S_64=m -CONFIG_KVM_BOOK3S_64_PR=m +# CONFIG_KVM_BOOK3S_64_PR is not set # CONFIG_KVM_BOOK3S_HV_EXIT_TIMING is not set CONFIG_KVM_BOOK3S_PR_POSSIBLE=y CONFIG_KVM_GUEST=y @@ -6091,7 +6094,6 @@ CONFIG_VDPA=m # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y CONFIG_VEXPRESS_SYSCFG=y CONFIG_VFAT_FS=m CONFIG_VFIO_IOMMU_TYPE1=m @@ -6280,6 +6282,7 @@ CONFIG_VMAP_STACK=y # CONFIG_VME_BUS is not set CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 12de9ba4b..6a66b0eb8 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -851,6 +851,7 @@ CONFIG_CM3605=m CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y CONFIG_CMDLINE="" # CONFIG_CMDLINE_BOOL is not set @@ -2446,6 +2447,7 @@ CONFIG_INTEL_IDXD=m CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_SOC_PMIC is not set CONFIG_INTEL_STRATIX10_SERVICE=m +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set @@ -6760,12 +6762,12 @@ CONFIG_VCNL3020=m CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y +# CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y # CONFIG_VF610_ADC is not set # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m @@ -6972,6 +6974,7 @@ CONFIG_VLAN_8021Q_MVRP=y CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index d426bddc0..e00b1fc17 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -690,6 +690,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y CONFIG_CMDLINE="" # CONFIG_CMDLINE_BOOL is not set @@ -934,10 +935,11 @@ CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set # CONFIG_CX_ECAT is not set CONFIG_CXL_BIMODAL=y -# CONFIG_CXL_BUS is not set +CONFIG_CXL_BUS=y CONFIG_CXLFLASH=m CONFIG_CXL_LIB=y CONFIG_CXL=m +# CONFIG_CXL_MEM is not set CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DA280 is not set @@ -2208,6 +2210,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SOC_PMIC_CHTWC is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_STRATIX10_SERVICE is not set +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m @@ -2545,7 +2548,7 @@ CONFIG_KSM=y CONFIG_KVM_AMD_SEV=y CONFIG_KVM_BOOK3S_64_HV=m CONFIG_KVM_BOOK3S_64=m -CONFIG_KVM_BOOK3S_64_PR=m +# CONFIG_KVM_BOOK3S_64_PR is not set # CONFIG_KVM_BOOK3S_HV_EXIT_TIMING is not set CONFIG_KVM_BOOK3S_PR_POSSIBLE=y CONFIG_KVM_GUEST=y @@ -6072,7 +6075,6 @@ CONFIG_VDPA=m # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y CONFIG_VEXPRESS_SYSCFG=y CONFIG_VFAT_FS=m CONFIG_VFIO_IOMMU_TYPE1=m @@ -6261,6 +6263,7 @@ CONFIG_VMAP_STACK=y # CONFIG_VME_BUS is not set CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index fa3ca91ea..0a5769335 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -859,6 +859,7 @@ CONFIG_CM3605=m CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y CONFIG_CMDLINE="" # CONFIG_CMDLINE_EXTEND is not set @@ -2444,6 +2445,7 @@ CONFIG_INTEL_IDXD=m CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_SOC_PMIC is not set CONFIG_INTEL_STRATIX10_SERVICE=m +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set @@ -6724,12 +6726,12 @@ CONFIG_VCNL3020=m CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y +# CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y # CONFIG_VF610_ADC is not set # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m @@ -6943,6 +6945,7 @@ CONFIG_VMLOGRDR=m CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index bd3a8fc9c..955e15c64 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -695,6 +695,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y # CONFIG_CMDLINE_EXTEND is not set CONFIG_CMDLINE_FROM_BOOTLOADER=y @@ -938,7 +939,8 @@ CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set # CONFIG_CX_ECAT is not set CONFIG_CXL_BIMODAL=y -# CONFIG_CXL_BUS is not set +CONFIG_CXL_BUS=y +# CONFIG_CXL_MEM is not set # CONFIG_CYCLADES is not set # CONFIG_CYZ_INTR is not set # CONFIG_DA280 is not set @@ -2203,6 +2205,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SOC_PMIC_CHTWC is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_STRATIX10_SERVICE is not set +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m @@ -6040,7 +6043,6 @@ CONFIG_VDPA=m # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y CONFIG_VEXPRESS_SYSCFG=y CONFIG_VFAT_FS=m CONFIG_VFIO_AP=m @@ -6235,6 +6237,7 @@ CONFIG_VMCP=y CONFIG_VMLOGRDR=m CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 653c705e3..32abca750 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -858,6 +858,7 @@ CONFIG_CM3605=m CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y CONFIG_CMDLINE="" # CONFIG_CMDLINE_EXTEND is not set @@ -2427,6 +2428,7 @@ CONFIG_INTEL_IDXD=m CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_SOC_PMIC is not set CONFIG_INTEL_STRATIX10_SERVICE=m +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set @@ -6699,12 +6701,12 @@ CONFIG_VCNL3020=m CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y +# CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y # CONFIG_VF610_ADC is not set # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m @@ -6918,6 +6920,7 @@ CONFIG_VMLOGRDR=m CONFIG_VMSPLIT_3G=y # CONFIG_VMXNET3 is not set CONFIG_VORTEX=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 427c02ed8..70a9c7e1f 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -695,6 +695,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y # CONFIG_CMDLINE_EXTEND is not set CONFIG_CMDLINE_FROM_BOOTLOADER=y @@ -938,7 +939,8 @@ CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set # CONFIG_CX_ECAT is not set CONFIG_CXL_BIMODAL=y -# CONFIG_CXL_BUS is not set +CONFIG_CXL_BUS=y +# CONFIG_CXL_MEM is not set # CONFIG_CYCLADES is not set # CONFIG_CYZ_INTR is not set # CONFIG_DA280 is not set @@ -2187,6 +2189,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SOC_PMIC_CHTWC is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_STRATIX10_SERVICE is not set +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m @@ -6021,7 +6024,6 @@ CONFIG_VDPA=m # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y CONFIG_VEXPRESS_SYSCFG=y CONFIG_VFAT_FS=m CONFIG_VFIO_AP=m @@ -6216,6 +6218,7 @@ CONFIG_VMCP=y CONFIG_VMLOGRDR=m CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 07b876b08..3691b56a1 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -701,6 +701,7 @@ CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set # CONFIG_CMA is not set +# CONFIG_CMA_SYSFS is not set # CONFIG_CMDLINE_EXTEND is not set CONFIG_CMDLINE_FROM_BOOTLOADER=y # CONFIG_CMDLINE_PARTITION is not set @@ -944,7 +945,8 @@ CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set # CONFIG_CX_ECAT is not set CONFIG_CXL_BIMODAL=y -# CONFIG_CXL_BUS is not set +CONFIG_CXL_BUS=y +# CONFIG_CXL_MEM is not set # CONFIG_CYCLADES is not set # CONFIG_CYZ_INTR is not set # CONFIG_DA280 is not set @@ -2206,6 +2208,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SOC_PMIC_CHTWC is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_STRATIX10_SERVICE is not set +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m @@ -6056,7 +6059,6 @@ CONFIG_UWB_I1480U=m # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y CONFIG_VEXPRESS_SYSCFG=y # CONFIG_VFAT_FS is not set CONFIG_VFIO_AP=m @@ -6252,6 +6254,7 @@ CONFIG_VM_EVENT_COUNTERS=y CONFIG_VMLOGRDR=m CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m # CONFIG_VSOCKETS is not set CONFIG_VSOCKETS_LOOPBACK=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 850b9759d..31f985131 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -917,6 +917,7 @@ CONFIG_CMA_SIZE_MBYTES=0 CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y CONFIG_CMDLINE="" # CONFIG_CMDLINE_BOOL is not set @@ -2731,6 +2732,7 @@ CONFIG_INTEL_SOC_PMIC_MRFLD=m CONFIG_INTEL_SOC_PMIC=y CONFIG_INTEL_SPEED_SELECT_INTERFACE=m CONFIG_INTEL_STRATIX10_SERVICE=m +# CONFIG_INTEL_TCC_COOLING is not set CONFIG_INTEL_TELEMETRY=m CONFIG_INTEL_TH_ACPI=m # CONFIG_INTEL_TH_DEBUG is not set @@ -7255,12 +7257,12 @@ CONFIG_VCNL3020=m CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y +# CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y # CONFIG_VF610_ADC is not set # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m @@ -7481,6 +7483,7 @@ CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m CONFIG_VORTEX=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index fd7d7c9b5..8ee58a784 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -718,6 +718,7 @@ CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set # CONFIG_CMA is not set +# CONFIG_CMA_SYSFS is not set # CONFIG_CMDLINE_BOOL is not set # CONFIG_CMDLINE_EXTEND is not set CONFIG_CMDLINE_FROM_BOOTLOADER=y @@ -994,7 +995,8 @@ CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set # CONFIG_CX_ECAT is not set CONFIG_CXL_BIMODAL=y -# CONFIG_CXL_BUS is not set +CONFIG_CXL_BUS=y +# CONFIG_CXL_MEM is not set CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DA280 is not set @@ -2384,6 +2386,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SOC_PMIC is not set CONFIG_INTEL_SPEED_SELECT_INTERFACE=m # CONFIG_INTEL_STRATIX10_SERVICE is not set +# CONFIG_INTEL_TCC_COOLING is not set CONFIG_INTEL_TH_ACPI=m # CONFIG_INTEL_TH_DEBUG is not set CONFIG_INTEL_TH_GTH=m @@ -6324,7 +6327,6 @@ CONFIG_VDPA=m # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y CONFIG_VEXPRESS_SYSCFG=y CONFIG_VFAT_FS=m CONFIG_VFIO_IOMMU_TYPE1=m @@ -6521,6 +6523,7 @@ CONFIG_VMWARE_PVSCSI=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 84aa7b7cc..a7b83a4b7 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -916,6 +916,7 @@ CONFIG_CMA_SIZE_MBYTES=0 CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y CONFIG_CMDLINE="" # CONFIG_CMDLINE_BOOL is not set @@ -2714,6 +2715,7 @@ CONFIG_INTEL_SOC_PMIC_MRFLD=m CONFIG_INTEL_SOC_PMIC=y CONFIG_INTEL_SPEED_SELECT_INTERFACE=m CONFIG_INTEL_STRATIX10_SERVICE=m +# CONFIG_INTEL_TCC_COOLING is not set CONFIG_INTEL_TELEMETRY=m CONFIG_INTEL_TH_ACPI=m # CONFIG_INTEL_TH_DEBUG is not set @@ -7231,12 +7233,12 @@ CONFIG_VCNL3020=m CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y +# CONFIG_VDPA_SIM_BLOCK is not set CONFIG_VDPA_SIM=m CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y # CONFIG_VF610_ADC is not set # CONFIG_VF610_DAC is not set CONFIG_VFAT_FS=m @@ -7457,6 +7459,7 @@ CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m CONFIG_VORTEX=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 37de06600..43c8d77f2 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -718,6 +718,7 @@ CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set # CONFIG_CMA is not set +# CONFIG_CMA_SYSFS is not set # CONFIG_CMDLINE_BOOL is not set # CONFIG_CMDLINE_EXTEND is not set CONFIG_CMDLINE_FROM_BOOTLOADER=y @@ -994,7 +995,8 @@ CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set # CONFIG_CX_ECAT is not set CONFIG_CXL_BIMODAL=y -# CONFIG_CXL_BUS is not set +CONFIG_CXL_BUS=y +# CONFIG_CXL_MEM is not set CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_DA280 is not set @@ -2368,6 +2370,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SOC_PMIC is not set CONFIG_INTEL_SPEED_SELECT_INTERFACE=m # CONFIG_INTEL_STRATIX10_SERVICE is not set +# CONFIG_INTEL_TCC_COOLING is not set CONFIG_INTEL_TH_ACPI=m # CONFIG_INTEL_TH_DEBUG is not set CONFIG_INTEL_TH_GTH=m @@ -6302,7 +6305,6 @@ CONFIG_VDPA=m # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y CONFIG_VEXPRESS_SYSCFG=y CONFIG_VFAT_FS=m CONFIG_VFIO_IOMMU_TYPE1=m @@ -6499,6 +6501,7 @@ CONFIG_VMWARE_PVSCSI=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m diff --git a/kernel.spec b/kernel.spec index c21d6e410..d37a91463 100755 --- a/kernel.spec +++ b/kernel.spec @@ -66,7 +66,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc0.20210505gitd665ea6ea86c.8 +%global distro_build 0.rc0.20210506git8404c9fbc84b.9 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -107,13 +107,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.13.0 -%define pkgrelease 0.rc0.20210505gitd665ea6ea86c.8 +%define pkgrelease 0.rc0.20210506git8404c9fbc84b.9 # This is needed to do merge window version magic %define patchlevel 13 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20210505gitd665ea6ea86c.8%{?buildid}%{?dist} +%define specrelease 0.rc0.20210506git8404c9fbc84b.9%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -618,7 +618,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.12-13882-gd665ea6ea86c.tar.xz +Source0: linux-5.12-14380-g8404c9fbc84b.tar.xz Source1: Makefile.rhelver @@ -853,6 +853,7 @@ It provides the kernel source files common to all builds. %if %{with_perf} %package -n perf Summary: Performance monitoring for the Linux kernel +Requires: bzip2 License: GPLv2 %description -n perf This package contains the perf tool, which enables performance monitoring @@ -1268,8 +1269,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.12-13882-gd665ea6ea86c -c -mv linux-5.12-13882-gd665ea6ea86c linux-%{KVERREL} +%setup -q -n kernel-5.12-14380-g8404c9fbc84b -c +mv linux-5.12-14380-g8404c9fbc84b linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2779,6 +2780,11 @@ fi # # %changelog +* Thu May 06 2021 Fedora Kernel Team [5.13.0-0.rc0.20210506git8404c9fbc84b.9] +- Keep CONFIG_KASAN_HW_TAGS off for aarch64 debug configs (Justin M. Forbes) +- New configs in drivers/bus (Fedora Kernel Team) +- RHEL: Don't build KVM PR module on ppc64 (David Gibson) [1930649] + * Wed May 05 2021 Fedora Kernel Team [5.13.0-0.rc0.20210505gitd665ea6ea86c.8] - Flip CONFIG_USB_ROLE_SWITCH from m to y (Justin M. Forbes) - Set valid options for CONFIG_FW_LOADER_USER_HELPER (Justin M. Forbes) diff --git a/patch-5.13.0-redhat.patch b/patch-5.13.0-redhat.patch index 527604a15..c7f3432ee 100644 --- a/patch-5.13.0-redhat.patch +++ b/patch-5.13.0-redhat.patch @@ -91,10 +91,10 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 02470ba1fe6a..6946753cc08c 100644 +index a1266f33d6e6..8796144af189 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5731,6 +5731,14 @@ +@@ -5750,6 +5750,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -181,10 +181,10 @@ index 72af8e423f11..5295f99d5c92 100644 $(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 085c830d344b..ea1306234cbc 100644 +index 24804f11302d..fd5ff3fa0d5b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1482,9 +1482,9 @@ config HIGHMEM +@@ -1484,9 +1484,9 @@ config HIGHMEM If unsure, say n. config HIGHPTE @@ -197,10 +197,10 @@ index 085c830d344b..ea1306234cbc 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 7f2a80091337..3ee3a087b985 100644 +index f0b17d758912..c913235275a1 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -917,7 +917,7 @@ endchoice +@@ -922,7 +922,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -209,7 +209,7 @@ index 7f2a80091337..3ee3a087b985 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -@@ -1178,6 +1178,7 @@ config XEN +@@ -1174,6 +1174,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if ARM64_64K_PAGES @@ -1474,10 +1474,10 @@ index ec44a79e951a..5025827ef396 100644 struct pci_driver *drv; struct pci_dev *dev; diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 653660e3ba9e..98851d00dc4d 100644 +index dcb229de1acb..eb2f6394b286 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4143,6 +4143,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, +@@ -4132,6 +4132,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084, quirk_bridge_cavm_thrx2_pcie_root); @@ -1969,10 +1969,10 @@ index 8100bb477d86..f758f2869c02 100644 /* Exported symbols */ diff --git a/include/linux/pci.h b/include/linux/pci.h -index 413ece666bf9..b53f1f41e42c 100644 +index c20211e59a57..ba81f1b4bd9b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1432,6 +1432,10 @@ int pci_add_dynid(struct pci_driver *drv, +@@ -1430,6 +1430,10 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data); const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); diff --git a/sources b/sources index 9ec5031e1..5ead3a0b7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.12-13882-gd665ea6ea86c.tar.xz) = 87dd8fefdd98f285c85e50a85d3382168cb468441b808190f324561c8d7bd6db1ab821c00cd78a0cf3f8b0569118c43cef43582bddbf864b365bafa68aad1f6e -SHA512 (kernel-abi-whitelists-5.13.0-0.rc0.20210505gitd665ea6ea86c.8.tar.bz2) = 0fcc3a0a3c07cee3c7ac9debe71cefa6d13ecb9f1dbaeaca4f4e277b469ac02e010100c9e3bd3ffc7d35194c9b5189e3bc8772f2ee139cb4f2e39e18a6e32a24 -SHA512 (kernel-kabi-dw-5.13.0-0.rc0.20210505gitd665ea6ea86c.8.tar.bz2) = 6adc0f85f830542792dba68a78dc8d1bdf0fb6e0d96033f189e1f8469dc90b77bbcb405b2a6464530e85a2258902490ce48276722e7b9b6da560af9cc20432a0 +SHA512 (linux-5.12-14380-g8404c9fbc84b.tar.xz) = 19c32de42916da26483d5c2470be2780f975469657166c5ec59567805d1859039e55329729eb17a138924932b1033383736f7fe036c2a467d2b4ebb288d0264e +SHA512 (kernel-abi-whitelists-5.13.0-0.rc0.20210506git8404c9fbc84b.9.tar.bz2) = acceb5e9c84413e96458b61678a689a6e689855fc6375baad91e210ec8b890e3d656694f474e8cf056be66af792295e5e20bacf9868509954a8934e5057cfb47 +SHA512 (kernel-kabi-dw-5.13.0-0.rc0.20210506git8404c9fbc84b.9.tar.bz2) = 1fc239cbf9bfb40a06ad0373552a9a0107d4c93b2c70fa1e752d9436ca5d3a78f7dfce125a569b1074befc032085132ec337ca6ae3c9a8cbe34b0d2b7c437ba6 -- cgit From 021f420fbfd59a242a8a57e4485c937638777988 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 7 May 2021 09:34:23 -0500 Subject: kernel-5.13.0-0.rc0.20210507gita48b0872e694.10 * Fri May 07 2021 Fedora Kernel Team [5.13.0-0.rc0.20210507gita48b0872e694.10] - Keep sctp and l2tp modules in modules-extra (Don Zickus) - Fix ppc64le cross build packaging (Don Zickus) - Fedora: Make amd_pinctrl module builtin (Hans de Goede) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 5 +++++ kernel-aarch64-debug-rhel.config | 5 +++++ kernel-aarch64-fedora.config | 5 +++++ kernel-aarch64-rhel.config | 5 +++++ kernel-armv7hl-debug-fedora.config | 5 +++++ kernel-armv7hl-fedora.config | 5 +++++ kernel-armv7hl-lpae-debug-fedora.config | 5 +++++ kernel-armv7hl-lpae-fedora.config | 5 +++++ kernel-i686-debug-fedora.config | 7 ++++++- kernel-i686-fedora.config | 7 ++++++- kernel-ppc64le-debug-fedora.config | 5 +++++ kernel-ppc64le-debug-rhel.config | 5 +++++ kernel-ppc64le-fedora.config | 5 +++++ kernel-ppc64le-rhel.config | 5 +++++ kernel-s390x-debug-fedora.config | 5 +++++ kernel-s390x-debug-rhel.config | 5 +++++ kernel-s390x-fedora.config | 5 +++++ kernel-s390x-rhel.config | 5 +++++ kernel-s390x-zfcpdump-rhel.config | 5 +++++ kernel-x86_64-debug-fedora.config | 7 ++++++- kernel-x86_64-debug-rhel.config | 5 +++++ kernel-x86_64-fedora.config | 7 ++++++- kernel-x86_64-rhel.config | 5 +++++ kernel.spec | 20 ++++++++++++-------- mod-extra.list.rhel | 2 ++ patch-5.13.0-redhat.patch | 14 +++++++------- sources | 6 +++--- 28 files changed, 144 insertions(+), 23 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index f74bfc4ea..a5081aa8d 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 = 9 +RHEL_RELEASE = 10 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index ce28f8ae3..1dcf77de4 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2947,6 +2947,7 @@ CONFIG_INPUT_HISI_POWERKEY=y CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -4047,6 +4048,7 @@ CONFIG_MMC_VUB300=m CONFIG_MMC_WBSD=m CONFIG_MMC=y CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -7442,7 +7444,9 @@ CONFIG_TOUCHSCREEN_GOODIX=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m @@ -7451,6 +7455,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 0e91e8cb4..8cf25b560 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2321,6 +2321,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set +# CONFIG_INPUT_IQS626A is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_KEYBOARD is not set @@ -3251,6 +3252,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMC_WBSD is not set CONFIG_MMIOTRACE=y CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -5857,7 +5859,9 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set @@ -5866,6 +5870,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set # CONFIG_TOUCHSCREEN_MK712 is not set # CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index fdccbb5ff..5382b5ff7 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2931,6 +2931,7 @@ CONFIG_INPUT_HISI_POWERKEY=y CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -4024,6 +4025,7 @@ CONFIG_MMC_VUB300=m CONFIG_MMC_WBSD=m CONFIG_MMC=y CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -7417,7 +7419,9 @@ CONFIG_TOUCHSCREEN_GOODIX=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m @@ -7426,6 +7430,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 68fa1a482..80ae869e4 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2305,6 +2305,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set +# CONFIG_INPUT_IQS626A is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_KEYBOARD is not set @@ -3231,6 +3232,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMC_WBSD is not set # CONFIG_MMIOTRACE is not set CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -5834,7 +5836,9 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set @@ -5843,6 +5847,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set # CONFIG_TOUCHSCREEN_MK712 is not set # CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index f02dba1bd..cb82fda6a 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2974,6 +2974,7 @@ CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -4122,6 +4123,7 @@ CONFIG_MMC=y CONFIG_MMP_PDMA=y CONFIG_MMP_TDMA=y CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -7677,7 +7679,9 @@ CONFIG_TOUCHSCREEN_GOODIX=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_ILITEK is not set CONFIG_TOUCHSCREEN_IMX6UL_TSC=m # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m @@ -7687,6 +7691,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index e6e1730e2..e22f46759 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2959,6 +2959,7 @@ CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -4100,6 +4101,7 @@ CONFIG_MMC=y CONFIG_MMP_PDMA=y CONFIG_MMP_TDMA=y CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -7653,7 +7655,9 @@ CONFIG_TOUCHSCREEN_GOODIX=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_ILITEK is not set CONFIG_TOUCHSCREEN_IMX6UL_TSC=m # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m @@ -7663,6 +7667,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index e6599c8b6..06db375c5 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2912,6 +2912,7 @@ CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -4030,6 +4031,7 @@ CONFIG_MMC_VUB300=m CONFIG_MMC_WBSD=m CONFIG_MMC=y CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -7435,7 +7437,9 @@ CONFIG_TOUCHSCREEN_GOODIX=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m @@ -7445,6 +7449,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index bca0cce23..27665af56 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2897,6 +2897,7 @@ CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -4008,6 +4009,7 @@ CONFIG_MMC_VUB300=m CONFIG_MMC_WBSD=m CONFIG_MMC=y CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -7411,7 +7413,9 @@ CONFIG_TOUCHSCREEN_GOODIX=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m @@ -7421,6 +7425,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 049875733..cac79131a 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -2585,6 +2585,7 @@ CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3677,6 +3678,7 @@ CONFIG_MMC_WBSD=m # CONFIG_MMIOTRACE_TEST is not set CONFIG_MMIOTRACE=y CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -4692,7 +4694,7 @@ CONFIG_PHYSICAL_START=0x400000 CONFIG_PID_NS=y CONFIG_PINCONF=y CONFIG_PINCTRL_ALDERLAKE=m -CONFIG_PINCTRL_AMD=m +CONFIG_PINCTRL_AMD=y CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CANNONLAKE=m @@ -6696,7 +6698,9 @@ CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_GUNZE=m # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_IQS5XX=m @@ -6705,6 +6709,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_PIXCIR=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 57976d4d7..8c7229567 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -2568,6 +2568,7 @@ CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3655,6 +3656,7 @@ CONFIG_MMC_WBSD=m # CONFIG_MMIOTRACE_TEST is not set CONFIG_MMIOTRACE=y CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -4670,7 +4672,7 @@ CONFIG_PHYSICAL_START=0x400000 CONFIG_PID_NS=y CONFIG_PINCONF=y CONFIG_PINCTRL_ALDERLAKE=m -CONFIG_PINCTRL_AMD=m +CONFIG_PINCTRL_AMD=y CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CANNONLAKE=m @@ -6672,7 +6674,9 @@ CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_GUNZE=m # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_IQS5XX=m @@ -6681,6 +6685,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_PIXCIR=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index c05538d0a..ddfcb9cb8 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2411,6 +2411,7 @@ CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3418,6 +3419,7 @@ CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_WBSD=m CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -6282,7 +6284,9 @@ CONFIG_TOUCHSCREEN_ELAN=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m @@ -6291,6 +6295,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 1193fa3e0..4ba428eb5 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2164,6 +2164,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set +# CONFIG_INPUT_IQS626A is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_KEYBOARD=y @@ -3095,6 +3096,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMC_WBSD is not set CONFIG_MMIOTRACE=y CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -5665,7 +5667,9 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set @@ -5674,6 +5678,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set # CONFIG_TOUCHSCREEN_MK712 is not set # CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 6a66b0eb8..28893ca22 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2394,6 +2394,7 @@ CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3395,6 +3396,7 @@ CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_WBSD=m CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -6257,7 +6259,9 @@ CONFIG_TOUCHSCREEN_ELAN=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m @@ -6266,6 +6270,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index e00b1fc17..cae0ecf30 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2148,6 +2148,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set +# CONFIG_INPUT_IQS626A is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_KEYBOARD=y @@ -3078,6 +3079,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMC_WBSD is not set # CONFIG_MMIOTRACE is not set CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -5646,7 +5648,9 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set @@ -5655,6 +5659,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set # CONFIG_TOUCHSCREEN_MK712 is not set # CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 0a5769335..b9bb264e1 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2392,6 +2392,7 @@ CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m +# CONFIG_INPUT_IQS626A is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_KEYBOARD is not set @@ -3393,6 +3394,7 @@ CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_WBSD=m CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -6226,7 +6228,9 @@ CONFIG_TOUCHSCREEN_ELAN=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m @@ -6235,6 +6239,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 955e15c64..6bff5055d 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2145,6 +2145,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set +# CONFIG_INPUT_IQS626A is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_KEYBOARD is not set @@ -3071,6 +3072,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMC_WBSD is not set CONFIG_MMIOTRACE=y CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -5609,7 +5611,9 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set @@ -5618,6 +5622,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set # CONFIG_TOUCHSCREEN_MK712 is not set # CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 32abca750..2403bf52a 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2375,6 +2375,7 @@ CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m +# CONFIG_INPUT_IQS626A is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_KEYBOARD is not set @@ -3370,6 +3371,7 @@ CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_WBSD=m CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -6201,7 +6203,9 @@ CONFIG_TOUCHSCREEN_ELAN=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m @@ -6210,6 +6214,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set CONFIG_TOUCHSCREEN_PIXCIR=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 70a9c7e1f..d816df0fe 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2129,6 +2129,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set +# CONFIG_INPUT_IQS626A is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_KEYBOARD is not set @@ -3054,6 +3055,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMC_WBSD is not set # CONFIG_MMIOTRACE is not set CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -5590,7 +5592,9 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set @@ -5599,6 +5603,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set # CONFIG_TOUCHSCREEN_MK712 is not set # CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 3691b56a1..b0eb3b01f 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2148,6 +2148,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set +# CONFIG_INPUT_IQS626A is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_KEYBOARD is not set @@ -3074,6 +3075,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMC_WBSD is not set # CONFIG_MMIOTRACE is not set CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -5624,7 +5626,9 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set @@ -5633,6 +5637,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set # CONFIG_TOUCHSCREEN_MK712 is not set # CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 31f985131..76eb99ab1 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2632,6 +2632,7 @@ CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3725,6 +3726,7 @@ CONFIG_MMC_WBSD=m # CONFIG_MMIOTRACE_TEST is not set CONFIG_MMIOTRACE=y CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -4735,7 +4737,7 @@ CONFIG_PHYSICAL_START=0x1000000 CONFIG_PID_NS=y CONFIG_PINCONF=y CONFIG_PINCTRL_ALDERLAKE=m -CONFIG_PINCTRL_AMD=m +CONFIG_PINCTRL_AMD=y CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CANNONLAKE=m @@ -6748,7 +6750,9 @@ CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_GUNZE=m # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_IQS5XX=m @@ -6757,6 +6761,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_PIXCIR=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 8ee58a784..9ba21cf2d 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2304,6 +2304,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_JOYDEV=m # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_KEYBOARD=y @@ -3271,6 +3272,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMIOTRACE_TEST is not set CONFIG_MMIOTRACE=y CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -5898,7 +5900,9 @@ CONFIG_TOUCHSCREEN_ELO=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set @@ -5907,6 +5911,7 @@ CONFIG_TOUCHSCREEN_ELO=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set # CONFIG_TOUCHSCREEN_MK712 is not set # CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index a7b83a4b7..d43df7b39 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2615,6 +2615,7 @@ CONFIG_INPUT_GPIO_VIBRA=m CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_IQS269A=m +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y @@ -3703,6 +3704,7 @@ CONFIG_MMC_WBSD=m # CONFIG_MMIOTRACE_TEST is not set CONFIG_MMIOTRACE=y CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -4713,7 +4715,7 @@ CONFIG_PHYSICAL_START=0x1000000 CONFIG_PID_NS=y CONFIG_PINCONF=y CONFIG_PINCTRL_ALDERLAKE=m -CONFIG_PINCTRL_AMD=m +CONFIG_PINCTRL_AMD=y CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m CONFIG_PINCTRL_CANNONLAKE=m @@ -6724,7 +6726,9 @@ CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_GUNZE=m # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set CONFIG_TOUCHSCREEN_ILI210X=m +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_IQS5XX=m @@ -6733,6 +6737,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_MMS114=m +# CONFIG_TOUCHSCREEN_MSG2638 is not set CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_PIXCIR=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 43c8d77f2..1ff674891 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2288,6 +2288,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set +# CONFIG_INPUT_IQS626A is not set CONFIG_INPUT_JOYDEV=m # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_KEYBOARD=y @@ -3252,6 +3253,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMIOTRACE is not set # CONFIG_MMIOTRACE_TEST is not set CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -5876,7 +5878,9 @@ CONFIG_TOUCHSCREEN_ELO=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set @@ -5885,6 +5889,7 @@ CONFIG_TOUCHSCREEN_ELO=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set # CONFIG_TOUCHSCREEN_MK712 is not set # CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set diff --git a/kernel.spec b/kernel.spec index d37a91463..83b325fcb 100755 --- a/kernel.spec +++ b/kernel.spec @@ -66,7 +66,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc0.20210506git8404c9fbc84b.9 +%global distro_build 0.rc0.20210507gita48b0872e694.10 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -107,13 +107,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.13.0 -%define pkgrelease 0.rc0.20210506git8404c9fbc84b.9 +%define pkgrelease 0.rc0.20210507gita48b0872e694.10 # This is needed to do merge window version magic %define patchlevel 13 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20210506git8404c9fbc84b.9%{?buildid}%{?dist} +%define specrelease 0.rc0.20210507gita48b0872e694.10%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -618,7 +618,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.12-14380-g8404c9fbc84b.tar.xz +Source0: linux-5.12-14712-ga48b0872e694.tar.xz Source1: Makefile.rhelver @@ -1269,8 +1269,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.12-14380-g8404c9fbc84b -c -mv linux-5.12-14380-g8404c9fbc84b linux-%{KVERREL} +%setup -q -n kernel-5.12-14712-ga48b0872e694 -c +mv linux-5.12-14712-ga48b0872e694 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1759,8 +1759,7 @@ BuildKernel() { if [ -f arch/%{asmarch}/kernel/module.lds ]; then cp -a --parents arch/%{asmarch}/kernel/module.lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ fi - rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o - rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o + find $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts \( -iname "*.o" -o -iname "*.cmd" \) -exec rm -f {} + %ifarch ppc64le cp -a --parents arch/powerpc/lib/crtsavres.[So] $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ %endif @@ -2780,6 +2779,11 @@ fi # # %changelog +* Fri May 07 2021 Fedora Kernel Team [5.13.0-0.rc0.20210507gita48b0872e694.10] +- Keep sctp and l2tp modules in modules-extra (Don Zickus) +- Fix ppc64le cross build packaging (Don Zickus) +- Fedora: Make amd_pinctrl module builtin (Hans de Goede) + * Thu May 06 2021 Fedora Kernel Team [5.13.0-0.rc0.20210506git8404c9fbc84b.9] - Keep CONFIG_KASAN_HW_TAGS off for aarch64 debug configs (Justin M. Forbes) - New configs in drivers/bus (Fedora Kernel Team) diff --git a/mod-extra.list.rhel b/mod-extra.list.rhel index ce8f88942..0f90828ef 100644 --- a/mod-extra.list.rhel +++ b/mod-extra.list.rhel @@ -79,6 +79,7 @@ l2tp_core.ko l2tp_debugfs.ko l2tp_eth.ko l2tp_ip.ko +l2tp_ip6.ko l2tp_netlink.ko l2tp_ppp.ko lec.ko @@ -132,6 +133,7 @@ sch_red.ko sch_sfb.ko sch_teql.ko sctp.ko +sctp_diag.ko sctp_probe.ko sidewinder.ko sja1000.ko diff --git a/patch-5.13.0-redhat.patch b/patch-5.13.0-redhat.patch index c7f3432ee..852058b07 100644 --- a/patch-5.13.0-redhat.patch +++ b/patch-5.13.0-redhat.patch @@ -91,10 +91,10 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index a1266f33d6e6..8796144af189 100644 +index a816935d23d4..3037285ebb3b 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5750,6 +5750,14 @@ +@@ -5762,6 +5762,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -259,7 +259,7 @@ index dba04fbc37a2..f809ab6441fd 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 72134f9f6ff5..95970f299ef5 100644 +index 5aab59ad5688..c53572b81c37 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -470,7 +470,7 @@ index e209081d644b..7484bcf59a1b 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index bc973fbd70b2..15b3b8a03785 100644 +index a22778e880c2..ecdf66fb96b5 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1640,6 +1640,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -1877,10 +1877,10 @@ index 6b5d36babfcc..fd4a5d66a9d0 100644 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) { diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index 5b7ed6dc99ac..17703b5a7091 100644 +index 09035ac67d4b..acc5fd8ba845 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -458,7 +458,24 @@ extern enum system_states { +@@ -451,7 +451,24 @@ extern enum system_states { #define TAINT_LIVEPATCH 15 #define TAINT_AUX 16 #define TAINT_RANDSTRUCT 17 @@ -1906,7 +1906,7 @@ index 5b7ed6dc99ac..17703b5a7091 100644 #define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1) struct taint_flag { -@@ -744,4 +761,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } +@@ -737,4 +754,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } /* OTHER_WRITABLE? Generally considered a bad idea. */ \ BUILD_BUG_ON_ZERO((perms) & 2) + \ (perms)) diff --git a/sources b/sources index 5ead3a0b7..856d63123 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.12-14380-g8404c9fbc84b.tar.xz) = 19c32de42916da26483d5c2470be2780f975469657166c5ec59567805d1859039e55329729eb17a138924932b1033383736f7fe036c2a467d2b4ebb288d0264e -SHA512 (kernel-abi-whitelists-5.13.0-0.rc0.20210506git8404c9fbc84b.9.tar.bz2) = acceb5e9c84413e96458b61678a689a6e689855fc6375baad91e210ec8b890e3d656694f474e8cf056be66af792295e5e20bacf9868509954a8934e5057cfb47 -SHA512 (kernel-kabi-dw-5.13.0-0.rc0.20210506git8404c9fbc84b.9.tar.bz2) = 1fc239cbf9bfb40a06ad0373552a9a0107d4c93b2c70fa1e752d9436ca5d3a78f7dfce125a569b1074befc032085132ec337ca6ae3c9a8cbe34b0d2b7c437ba6 +SHA512 (linux-5.12-14712-ga48b0872e694.tar.xz) = cf573cd6b095cfbfdd9bf67f6759ab146540b52c78636226fe42c69faadd21b29cf4394a52451ae97451bb5f8e884153a0005d120ba7ed8d7114c1494b35d24f +SHA512 (kernel-abi-whitelists-5.13.0-0.rc0.20210507gita48b0872e694.10.tar.bz2) = 9ff777cce5eeaf79e98f85bb4820ebe82b3ee4f420b80a00e9ad6cdb9c335be3e4f0234a2fe24a8bff0c2733f7c4a58ee7c1664e492b98f1c9e2d41774814459 +SHA512 (kernel-kabi-dw-5.13.0-0.rc0.20210507gita48b0872e694.10.tar.bz2) = 87c6d5e37084dd3cb0e1dfcbb366f23f1d21dd1d1ce370db5695032bd1b2e12a8864e0f88707b8672107a454ecf2d181f44c288a44cef8c535b0505fa73b2c19 -- cgit From 1cac231319309a8322c7f29d89644752aba75a62 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 10 May 2021 09:28:06 -0500 Subject: kernel-5.13.0-0.rc1.13 * Mon May 10 2021 Fedora Kernel Team [5.13.0-0.rc1.13] - Remove unused boot loader specification files (David Ward) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- generate_bls_conf.sh | 35 ------------------ kernel-aarch64-debug-fedora.config | 27 +++++++------- kernel-aarch64-debug-rhel.config | 3 +- kernel-aarch64-fedora.config | 27 +++++++------- kernel-aarch64-rhel.config | 3 +- kernel-armv7hl-debug-fedora.config | 19 +++++----- kernel-armv7hl-fedora.config | 19 +++++----- kernel-armv7hl-lpae-debug-fedora.config | 19 +++++----- kernel-armv7hl-lpae-fedora.config | 19 +++++----- kernel-i686-debug-fedora.config | 13 +++---- kernel-i686-fedora.config | 13 +++---- kernel-ppc64le-debug-fedora.config | 13 +++---- kernel-ppc64le-debug-rhel.config | 3 +- kernel-ppc64le-fedora.config | 13 +++---- kernel-ppc64le-rhel.config | 3 +- kernel-s390x-debug-fedora.config | 13 +++---- kernel-s390x-debug-rhel.config | 3 +- kernel-s390x-fedora.config | 13 +++---- kernel-s390x-rhel.config | 3 +- kernel-s390x-zfcpdump-rhel.config | 3 +- kernel-x86_64-debug-fedora.config | 13 +++---- kernel-x86_64-debug-rhel.config | 3 +- kernel-x86_64-fedora.config | 13 +++---- kernel-x86_64-rhel.config | 3 +- kernel.spec | 34 +++++++++++------- patch-5.13.0-redhat.patch | 64 +++++++++++++++++---------------- rpminspect.yaml | 10 ++++++ sources | 6 ++-- 29 files changed, 184 insertions(+), 228 deletions(-) delete mode 100755 generate_bls_conf.sh create mode 100644 rpminspect.yaml diff --git a/Makefile.rhelver b/Makefile.rhelver index a5081aa8d..18afd0195 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 = 10 +RHEL_RELEASE = 13 # # Early y+1 numbering diff --git a/generate_bls_conf.sh b/generate_bls_conf.sh deleted file mode 100755 index 03b21821f..000000000 --- a/generate_bls_conf.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -set -e - -# shellcheck disable=SC1091 -. /etc/os-release - -kernelver=$1 && shift -rootfs=$1 && shift -variant=$1 && shift - -output="${rootfs}/lib/modules/${kernelver}/bls.conf" -date=$(date -u +%Y%m%d%H%M%S) - -if [ "${variant:-5}" = "debug" ]; then - debugname=" with debugging" - debugid="-debug" -else - debugname="" - debugid="" -fi - -# shellcheck will complain about bootprefix being referenced but not assigned, -# but that is perfectly OK here. -# shellcheck disable=SC2154 -cat > "$output" < [5.13.0-0.rc1.13] +- Remove unused boot loader specification files (David Ward) + +* Mon May 10 2021 Fedora Kernel Team [5.13.0-0.rc1.12] +- Revert "Merge branch 'fix-tag-check' into 'os-build'" (Justin Forbes) +- Enable CONFIG_DRM_AMDGPU_USERPTR for everyone (Justin M. Forbes) +- redhat: add initial rpminspect configuration (Herton R. Krzesinski) + +* Sat May 08 2021 Fedora Kernel Team [5.13.0-0.rc0.20210507gita48b0872e694.11] +- fedora: arm updates for 5.13 (Peter Robinson) +- fedora: Enable WWAN and associated MHI bits (Peter Robinson) +- Update CONFIG_MODPROBE_PATH to /usr/sbin (Justin Forbes) +- Fedora set modprobe path (Justin M. Forbes) + * Fri May 07 2021 Fedora Kernel Team [5.13.0-0.rc0.20210507gita48b0872e694.10] - Keep sctp and l2tp modules in modules-extra (Don Zickus) - Fix ppc64le cross build packaging (Don Zickus) diff --git a/patch-5.13.0-redhat.patch b/patch-5.13.0-redhat.patch index 852058b07..9376ddf44 100644 --- a/patch-5.13.0-redhat.patch +++ b/patch-5.13.0-redhat.patch @@ -30,7 +30,7 @@ drivers/net/ethernet/intel/ice/ice_main.c | 1 + drivers/net/wireguard/main.c | 7 + drivers/nvme/host/core.c | 22 +- - drivers/nvme/host/multipath.c | 18 +- + drivers/nvme/host/multipath.c | 20 +- drivers/nvme/host/nvme.h | 4 + drivers/pci/pci-driver.c | 29 ++ drivers/pci/quirks.c | 24 ++ @@ -66,7 +66,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 68 files changed, 1200 insertions(+), 186 deletions(-) + 68 files changed, 1201 insertions(+), 187 deletions(-) diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst index 75a9dd98e76e..3ff3291551f9 100644 @@ -91,10 +91,10 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index a816935d23d4..3037285ebb3b 100644 +index cb89dbdedc46..3d033c0b69f9 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5762,6 +5762,14 @@ +@@ -5764,6 +5764,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -143,7 +143,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 72af8e423f11..5295f99d5c92 100644 +index 53d09c414635..583c3a3510b9 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -157,7 +157,7 @@ index 72af8e423f11..5295f99d5c92 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -508,6 +512,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE +@@ -503,6 +507,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \ -Werror=implicit-function-declaration -Werror=implicit-int \ @@ -165,7 +165,7 @@ index 72af8e423f11..5295f99d5c92 100644 -Werror=return-type -Wno-format-security \ -std=gnu89 KBUILD_CPPFLAGS := -D__KERNEL__ -@@ -1292,7 +1297,13 @@ define filechk_version.h +@@ -1291,7 +1296,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -197,10 +197,10 @@ index 24804f11302d..fd5ff3fa0d5b 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 f0b17d758912..c913235275a1 100644 +index 9f1d8566bbf9..ebb24a713210 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -922,7 +922,7 @@ endchoice +@@ -921,7 +921,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -209,7 +209,7 @@ index f0b17d758912..c913235275a1 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -@@ -1174,6 +1174,7 @@ config XEN +@@ -1165,6 +1165,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if ARM64_64K_PAGES @@ -281,7 +281,7 @@ index 5aab59ad5688..c53572b81c37 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 6bdb69a9a7dc..1001dd85a984 100644 +index a1b756c49a93..e8992590d603 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1308,6 +1308,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) @@ -427,10 +427,10 @@ index 277f00b288d1..adbce15c273d 100644 for (i = 0; i < hest_tab->error_source_count; i++) { len = hest_esrc_len(hest_hdr); diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c -index e209081d644b..7484bcf59a1b 100644 +index c68e694fca26..146cba5ae5bc 100644 --- a/drivers/acpi/irq.c +++ b/drivers/acpi/irq.c -@@ -126,6 +126,7 @@ struct acpi_irq_parse_one_ctx { +@@ -130,6 +130,7 @@ struct acpi_irq_parse_one_ctx { unsigned int index; unsigned long *res_flags; struct irq_fwspec *fwspec; @@ -438,7 +438,7 @@ index e209081d644b..7484bcf59a1b 100644 }; /** -@@ -197,7 +198,8 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, +@@ -201,7 +202,8 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, return AE_CTRL_TERMINATE; case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: eirq = &ares->data.extended_irq; @@ -448,7 +448,7 @@ index e209081d644b..7484bcf59a1b 100644 return AE_OK; if (ctx->index >= eirq->interrupt_count) { ctx->index -= eirq->interrupt_count; -@@ -232,8 +234,19 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, +@@ -236,8 +238,19 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, static int acpi_irq_parse_one(acpi_handle handle, unsigned int index, struct irq_fwspec *fwspec, unsigned long *flags) { @@ -1291,7 +1291,7 @@ index 7a7d5f1a80fc..de28e2633761 100644 err_netlink: diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index b6f7815fa239..c2f177efe312 100644 +index 522c9b229f80..3161fec27575 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -241,6 +241,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1358,7 +1358,7 @@ index b6f7815fa239..c2f177efe312 100644 } EXPORT_SYMBOL_GPL(nvme_complete_rq); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index 0d0de3433f37..44b745bed521 100644 +index 0551796517e6..e64ab1be5765 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -8,7 +8,11 @@ @@ -1373,7 +1373,7 @@ index 0d0de3433f37..44b745bed521 100644 module_param(multipath, bool, 0444); MODULE_PARM_DESC(multipath, "turn on native support for multiple controllers per subsystem"); -@@ -65,13 +69,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags) +@@ -65,14 +69,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags) return true; } @@ -1383,12 +1383,13 @@ index 0d0de3433f37..44b745bed521 100644 struct nvme_ns *ns = req->q->queuedata; u16 status = nvme_req(req)->status & 0x7ff; - unsigned long flags; +- struct bio *bio; - - nvme_mpath_clear_current_path(ns); /* * If we got back an ANA error, we know the controller is alive but not -@@ -82,6 +83,15 @@ void nvme_failover_req(struct request *req) +@@ -83,6 +83,16 @@ void nvme_failover_req(struct request *req) set_bit(NVME_NS_ANA_PENDING, &ns->flags); queue_work(nvme_wq, &ns->ctrl->ana_work); } @@ -1398,17 +1399,18 @@ index 0d0de3433f37..44b745bed521 100644 +{ + struct nvme_ns *ns = req->q->queuedata; + unsigned long flags; ++ struct bio *bio; + + nvme_mpath_clear_current_path(ns); + nvme_update_ana(req); spin_lock_irqsave(&ns->head->requeue_lock, flags); - blk_steal_bios(&ns->head->requeue_list, req); + for (bio = req->bio; bio; bio = bio->bi_next) diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 773dde5b231d..31bba9c1ce70 100644 +index 05f31a2c64bb..401a93cfffde 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -694,6 +694,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); +@@ -708,6 +708,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags); void nvme_failover_req(struct request *req); @@ -1416,7 +1418,7 @@ index 773dde5b231d..31bba9c1ce70 100644 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id); -@@ -738,6 +739,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, +@@ -752,6 +753,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, static inline void nvme_failover_req(struct request *req) { } @@ -1706,10 +1708,10 @@ index d00aca3c77ce..ecc3aee57c3d 100644 { MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004, PCI_ANY_ID, PCI_ANY_ID }, diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c -index d74c32f84ef5..b7c38e7a5bfc 100644 +index 4eab564ea6a0..f2d360667273 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -7742,6 +7742,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { +@@ -7743,6 +7743,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { }; static struct pci_device_id qla2xxx_pci_tbl[] = { @@ -1717,7 +1719,7 @@ index d74c32f84ef5..b7c38e7a5bfc 100644 { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, -@@ -7754,13 +7755,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { +@@ -7755,13 +7756,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) }, @@ -1877,10 +1879,10 @@ index 6b5d36babfcc..fd4a5d66a9d0 100644 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) { diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index 09035ac67d4b..acc5fd8ba845 100644 +index 15d8bad3d2f2..5cc175748767 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -451,7 +451,24 @@ extern enum system_states { +@@ -453,7 +453,24 @@ extern enum system_states { #define TAINT_LIVEPATCH 15 #define TAINT_AUX 16 #define TAINT_RANDSTRUCT 17 @@ -1906,7 +1908,7 @@ index 09035ac67d4b..acc5fd8ba845 100644 #define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1) struct taint_flag { -@@ -737,4 +754,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } +@@ -739,4 +756,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } /* OTHER_WRITABLE? Generally considered a bad idea. */ \ BUILD_BUG_ON_ZERO((perms) & 2) + \ (perms)) @@ -2322,7 +2324,7 @@ index 06f7c50ce77f..09ed686ac5e6 100644 #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE) diff --git a/kernel/Makefile b/kernel/Makefile -index e8a6715f38dc..f92f94ce57aa 100644 +index 4df609be42d0..4ef0c0f6a8f4 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -12,6 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \ @@ -2654,7 +2656,7 @@ index 3e623ccc020b..3047abc9a507 100644 sprintf(fname, "%s.mod.c", mod->name); write_if_changed(&buf, fname); diff --git a/scripts/tags.sh b/scripts/tags.sh -index fd96734deff1..5b540f3dcff1 100755 +index db8ba411860a..2294fb0f17a9 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh @@ -16,6 +16,8 @@ fi diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 000000000..e540fbd45 --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,10 @@ +# additional rpminspect configuration for this branch + +--- +emptyrpm: + expected_empty: + - kernel + - kernel-debug + - kernel-lpae + - kernel-zfcpdump + - kernel-zfcpdump-modules diff --git a/sources b/sources index 856d63123..2b901534d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.12-14712-ga48b0872e694.tar.xz) = cf573cd6b095cfbfdd9bf67f6759ab146540b52c78636226fe42c69faadd21b29cf4394a52451ae97451bb5f8e884153a0005d120ba7ed8d7114c1494b35d24f -SHA512 (kernel-abi-whitelists-5.13.0-0.rc0.20210507gita48b0872e694.10.tar.bz2) = 9ff777cce5eeaf79e98f85bb4820ebe82b3ee4f420b80a00e9ad6cdb9c335be3e4f0234a2fe24a8bff0c2733f7c4a58ee7c1664e492b98f1c9e2d41774814459 -SHA512 (kernel-kabi-dw-5.13.0-0.rc0.20210507gita48b0872e694.10.tar.bz2) = 87c6d5e37084dd3cb0e1dfcbb366f23f1d21dd1d1ce370db5695032bd1b2e12a8864e0f88707b8672107a454ecf2d181f44c288a44cef8c535b0505fa73b2c19 +SHA512 (linux-5.13-rc1.tar.xz) = aa47d04c45bddbf69d1fe15e660cbf0568d8311536062a5fff81d201aa8041e78196d6ccb257acf65c3a317a2e131b12e49f18ddd08ffb8f169746144bff0ffc +SHA512 (kernel-abi-whitelists-5.13.0-0.rc1.13.tar.bz2) = 24ae299a24f21beee89dbd26ea9a3339852356ee53f6801781bf10a217fedbe66a326ff777bb392c19f32b7c0755ffecf5faa8b11eaed6d6a0eaf1433f5a529c +SHA512 (kernel-kabi-dw-5.13.0-0.rc1.13.tar.bz2) = 741b026ae3a0d645b9a16cad5bf4447acef522a0b957816c2213c6c6cc6d64d936cec6ca6ed65a4beb23b73ca1fb69a2cca0334a1be0109893559b66990500c0 -- cgit