diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-05-05 11:43:48 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-05-05 11:43:48 -0500 |
| commit | cbc42e18f58156417664a29cd6c981196a1d6c30 (patch) | |
| tree | 015b350a5326302ebe2533ea58e3ee035294bc13 | |
| parent | 27dc8ef7e8c19034fdfbbd0fcbcf8c2487a013c6 (diff) | |
| download | kernel-cbc42e18f58156417664a29cd6c981196a1d6c30.tar.gz kernel-cbc42e18f58156417664a29cd6c981196a1d6c30.tar.xz kernel-cbc42e18f58156417664a29cd6c981196a1d6c30.zip | |
kernel-5.13.0-0.rc0.20210505gitd665ea6ea86c.8
* Wed May 05 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [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 <jforbes@fedoraproject.org>
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 <kernel-team@fedoraproject.org> [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 <kernel-team@fedoraproject.org> [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); @@ -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 |