diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-26 07:15:55 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-26 07:15:55 +0100 |
| commit | d068cda92ed741ba7fa9542cf09dcce58f075b84 (patch) | |
| tree | 39df08878932ecaf47f1205aeae9614f4e0d1226 | |
| parent | 281b0c016996618caf6513e9def4a64abc47b8c6 (diff) | |
| parent | 7eb97f8090869a87498b9c84c3d6210be7e31523 (diff) | |
| download | kernel-d068cda92ed741ba7fa9542cf09dcce58f075b84.tar.gz kernel-d068cda92ed741ba7fa9542cf09dcce58f075b84.tar.xz kernel-d068cda92ed741ba7fa9542cf09dcce58f075b84.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
36 files changed, 94 insertions, 237 deletions
diff --git a/configs/fedora/debug/SND_CTL_VALIDATION b/configs/fedora/debug/SND_CTL_VALIDATION deleted file mode 100644 index c0c87e57e..000000000 --- a/configs/fedora/debug/SND_CTL_VALIDATION +++ /dev/null @@ -1 +0,0 @@ -SND_CTL_VALIDATION=y diff --git a/configs/fedora/generic/CONFIG_CAPI_AVM b/configs/fedora/generic/CONFIG_CAPI_AVM deleted file mode 100644 index e22084428..000000000 --- a/configs/fedora/generic/CONFIG_CAPI_AVM +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CAPI_AVM=y diff --git a/configs/fedora/generic/CONFIG_DRM_LVDS_ENCODER b/configs/fedora/generic/CONFIG_DRM_LVDS_ENCODER deleted file mode 100644 index e2ea277b3..000000000 --- a/configs/fedora/generic/CONFIG_DRM_LVDS_ENCODER +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_DRM_LVDS_ENCODER is not set diff --git a/configs/fedora/generic/CONFIG_EXFAT_FS b/configs/fedora/generic/CONFIG_EXFAT_FS deleted file mode 100644 index 2113d8106..000000000 --- a/configs/fedora/generic/CONFIG_EXFAT_FS +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_EXFAT_FS is not set diff --git a/configs/fedora/generic/CONFIG_GIGASET_BASE b/configs/fedora/generic/CONFIG_GIGASET_BASE deleted file mode 100644 index fa7bb4bea..000000000 --- a/configs/fedora/generic/CONFIG_GIGASET_BASE +++ /dev/null @@ -1 +0,0 @@ -CONFIG_GIGASET_BASE=m diff --git a/configs/fedora/generic/CONFIG_GIGASET_CAPI b/configs/fedora/generic/CONFIG_GIGASET_CAPI deleted file mode 100644 index b94738045..000000000 --- a/configs/fedora/generic/CONFIG_GIGASET_CAPI +++ /dev/null @@ -1 +0,0 @@ -CONFIG_GIGASET_CAPI=y diff --git a/configs/fedora/generic/CONFIG_GIGASET_DEBUG b/configs/fedora/generic/CONFIG_GIGASET_DEBUG deleted file mode 100644 index 95c9cd104..000000000 --- a/configs/fedora/generic/CONFIG_GIGASET_DEBUG +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_GIGASET_DEBUG is not set diff --git a/configs/fedora/generic/CONFIG_GIGASET_M101 b/configs/fedora/generic/CONFIG_GIGASET_M101 deleted file mode 100644 index 10388d0a9..000000000 --- a/configs/fedora/generic/CONFIG_GIGASET_M101 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_GIGASET_M101=m diff --git a/configs/fedora/generic/CONFIG_GIGASET_M105 b/configs/fedora/generic/CONFIG_GIGASET_M105 deleted file mode 100644 index cf3d1db9f..000000000 --- a/configs/fedora/generic/CONFIG_GIGASET_M105 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_GIGASET_M105=m diff --git a/configs/fedora/generic/CONFIG_HYSDN b/configs/fedora/generic/CONFIG_HYSDN deleted file mode 100644 index 2f1ddde6c..000000000 --- a/configs/fedora/generic/CONFIG_HYSDN +++ /dev/null @@ -1 +0,0 @@ -CONFIG_HYSDN=m diff --git a/configs/fedora/generic/CONFIG_HYSDN_CAPI b/configs/fedora/generic/CONFIG_HYSDN_CAPI deleted file mode 100644 index db9a861ab..000000000 --- a/configs/fedora/generic/CONFIG_HYSDN_CAPI +++ /dev/null @@ -1 +0,0 @@ -CONFIG_HYSDN_CAPI=y diff --git a/configs/fedora/generic/CONFIG_I2C_PARPORT_LIGHT b/configs/fedora/generic/CONFIG_I2C_PARPORT_LIGHT deleted file mode 100644 index e18239222..000000000 --- a/configs/fedora/generic/CONFIG_I2C_PARPORT_LIGHT +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_I2C_PARPORT_LIGHT is not set diff --git a/configs/fedora/generic/CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 b/configs/fedora/generic/CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE index e8e9e3ea8..e8e9e3ea8 100644 --- a/configs/fedora/generic/CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 +++ b/configs/fedora/generic/CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE diff --git a/configs/fedora/generic/CONFIG_THUNDERBOLT b/configs/fedora/generic/CONFIG_THUNDERBOLT deleted file mode 100644 index dce0561e8..000000000 --- a/configs/fedora/generic/CONFIG_THUNDERBOLT +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_THUNDERBOLT is not set diff --git a/configs/fedora/generic/CONFIG_VIRTIO_BLK_SCSI b/configs/fedora/generic/CONFIG_VIRTIO_BLK_SCSI deleted file mode 100644 index e551a8ba1..000000000 --- a/configs/fedora/generic/CONFIG_VIRTIO_BLK_SCSI +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_VIRTIO_BLK_SCSI is not set diff --git a/configs/fedora/generic/CONFIG_X86_PTDUMP b/configs/fedora/generic/CONFIG_X86_PTDUMP deleted file mode 100644 index 74f8094eb..000000000 --- a/configs/fedora/generic/CONFIG_X86_PTDUMP +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_X86_PTDUMP is not set diff --git a/configs/fedora/generic/arm/CONFIG_DRM_LVDS_ENCODER b/configs/fedora/generic/arm/CONFIG_DRM_LVDS_ENCODER deleted file mode 100644 index 53f0efb59..000000000 --- a/configs/fedora/generic/arm/CONFIG_DRM_LVDS_ENCODER +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DRM_LVDS_ENCODER=m diff --git a/configs/fedora/generic/x86/CONFIG_I2C_PARPORT_LIGHT b/configs/fedora/generic/x86/CONFIG_I2C_PARPORT_LIGHT deleted file mode 100644 index 1dbc68883..000000000 --- a/configs/fedora/generic/x86/CONFIG_I2C_PARPORT_LIGHT +++ /dev/null @@ -1 +0,0 @@ -CONFIG_I2C_PARPORT_LIGHT=m diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_THUNDERBOLT b/configs/fedora/generic/x86/x86_64/CONFIG_THUNDERBOLT deleted file mode 100644 index 12b8cdd76..000000000 --- a/configs/fedora/generic/x86/x86_64/CONFIG_THUNDERBOLT +++ /dev/null @@ -1 +0,0 @@ -CONFIG_THUNDERBOLT=m @@ -1 +1 @@ -ca7e1fd1026c5af6a533b4b5447e1d2f153e28f2 +63623fd44972d1ed2bfb6e0fb631dfcf547fd1e7 diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 4f7d8b02e..7a0576591 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -851,7 +851,6 @@ CONFIG_CAN_SUN4I=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAN_XILINXCAN=m -CONFIG_CAPI_AVM=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1534,7 +1533,6 @@ CONFIG_DRM_KOMEDA=m CONFIG_DRM_LIMA=m CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_LVDS_CODEC is not set -CONFIG_DRM_LVDS_ENCODER=m CONFIG_DRM=m CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_MCDE is not set @@ -1817,7 +1815,6 @@ CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -2077,11 +2074,6 @@ CONFIG_GENEVE=m CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_GFS2_FS=m CONFIG_GIANFAR=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_CAPI=y -# CONFIG_GIGASET_DEBUG is not set -CONFIG_GIGASET_M101=m -CONFIG_GIGASET_M105=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -2352,8 +2344,6 @@ CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK_QCOM=m CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set -CONFIG_HYSDN_CAPI=y -CONFIG_HYSDN=m CONFIG_HZ=100 # CONFIG_HZ_1000 is not set CONFIG_HZ_100=y @@ -2418,7 +2408,6 @@ CONFIG_I2C_NFORCE2=m # CONFIG_I2C_NOMADIK is not set CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set -# CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PIIX4 is not set CONFIG_I2C_PXA=m @@ -6586,7 +6575,6 @@ CONFIG_THERMAL_STATISTICS=y # CONFIG_THERMAL_WRITABLE_TRIPS is not set CONFIG_THERMAL=y CONFIG_THRUSTMASTER_FF=y -# CONFIG_THUNDERBOLT is not set CONFIG_THUNDER_NIC_BGX=m CONFIG_THUNDER_NIC_PF=m CONFIG_THUNDER_NIC_RGX=m @@ -7347,7 +7335,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 5cc1bd740..f28f03bc8 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -851,7 +851,6 @@ CONFIG_CAN_SUN4I=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAN_XILINXCAN=m -CONFIG_CAPI_AVM=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1526,7 +1525,6 @@ CONFIG_DRM_KOMEDA=m CONFIG_DRM_LIMA=m CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_LVDS_CODEC is not set -CONFIG_DRM_LVDS_ENCODER=m CONFIG_DRM=m CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_MCDE is not set @@ -1809,7 +1807,6 @@ CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -2061,11 +2058,6 @@ CONFIG_GENEVE=m CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_GFS2_FS=m CONFIG_GIANFAR=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_CAPI=y -# CONFIG_GIGASET_DEBUG is not set -CONFIG_GIGASET_M101=m -CONFIG_GIGASET_M105=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -2336,8 +2328,6 @@ CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK_QCOM=m CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set -CONFIG_HYSDN_CAPI=y -CONFIG_HYSDN=m CONFIG_HZ=100 # CONFIG_HZ_1000 is not set CONFIG_HZ_100=y @@ -2402,7 +2392,6 @@ CONFIG_I2C_NFORCE2=m # CONFIG_I2C_NOMADIK is not set CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set -# CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PIIX4 is not set CONFIG_I2C_PXA=m @@ -6564,7 +6553,6 @@ CONFIG_THERMAL_STATISTICS=y # CONFIG_THERMAL_WRITABLE_TRIPS is not set CONFIG_THERMAL=y CONFIG_THRUSTMASTER_FF=y -# CONFIG_THUNDERBOLT is not set CONFIG_THUNDER_NIC_BGX=m CONFIG_THUNDER_NIC_PF=m CONFIG_THUNDER_NIC_RGX=m @@ -7325,7 +7313,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m @@ -7466,7 +7453,6 @@ CONFIG_WLCORE_SPI=m # CONFIG_X25 is not set # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_X86_MCELOG_LEGACY=y -# CONFIG_X86_PTDUMP is not set CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 70355c239..0ddd5de3e 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -855,7 +855,6 @@ CONFIG_CAN_SUN4I=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAN_XILINXCAN=m -CONFIG_CAPI_AVM=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1544,7 +1543,6 @@ CONFIG_DRM_KOMEDA=m CONFIG_DRM_LIMA=m CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_LVDS_CODEC is not set -CONFIG_DRM_LVDS_ENCODER=m CONFIG_DRM=m CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_MCDE is not set @@ -1839,7 +1837,6 @@ CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -2084,11 +2081,6 @@ CONFIG_GENEVE=m CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_GFS2_FS=m # CONFIG_GIANFAR is not set -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_CAPI=y -# CONFIG_GIGASET_DEBUG is not set -CONFIG_GIGASET_M101=m -CONFIG_GIGASET_M105=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -2362,8 +2354,6 @@ CONFIG_HWSPINLOCK_QCOM=m # CONFIG_HWSPINLOCK_STM32 is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set -CONFIG_HYSDN_CAPI=y -CONFIG_HYSDN=m CONFIG_HZ_1000=y # CONFIG_HZ_100 is not set # CONFIG_HZ_200 is not set @@ -2428,7 +2418,6 @@ CONFIG_I2C_NFORCE2=m CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_OMAP=y -# CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PIIX4 is not set CONFIG_I2C_PXA=m @@ -6806,7 +6795,6 @@ CONFIG_THERMAL_STATISTICS=y CONFIG_THERMAL=y CONFIG_THRUSTMASTER_FF=y # CONFIG_THUMB2_KERNEL is not set -# CONFIG_THUNDERBOLT is not set CONFIG_TI_ADC081C=m # CONFIG_TI_ADC0832 is not set # CONFIG_TI_ADC084S021 is not set @@ -7636,7 +7624,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 42e3056f7..a9a7f0576 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -855,7 +855,6 @@ CONFIG_CAN_SUN4I=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAN_XILINXCAN=m -CONFIG_CAPI_AVM=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1537,7 +1536,6 @@ CONFIG_DRM_KOMEDA=m CONFIG_DRM_LIMA=m CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_LVDS_CODEC is not set -CONFIG_DRM_LVDS_ENCODER=m CONFIG_DRM=m CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_MCDE is not set @@ -1832,7 +1830,6 @@ CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -2069,11 +2066,6 @@ CONFIG_GENEVE=m CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_GFS2_FS=m # CONFIG_GIANFAR is not set -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_CAPI=y -# CONFIG_GIGASET_DEBUG is not set -CONFIG_GIGASET_M101=m -CONFIG_GIGASET_M105=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -2347,8 +2339,6 @@ CONFIG_HWSPINLOCK_QCOM=m # CONFIG_HWSPINLOCK_STM32 is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set -CONFIG_HYSDN_CAPI=y -CONFIG_HYSDN=m CONFIG_HZ_1000=y # CONFIG_HZ_100 is not set # CONFIG_HZ_200 is not set @@ -2413,7 +2403,6 @@ CONFIG_I2C_NFORCE2=m CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_OMAP=y -# CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PIIX4 is not set CONFIG_I2C_PXA=m @@ -6785,7 +6774,6 @@ CONFIG_THERMAL_STATISTICS=y CONFIG_THERMAL=y CONFIG_THRUSTMASTER_FF=y # CONFIG_THUMB2_KERNEL is not set -# CONFIG_THUNDERBOLT is not set CONFIG_TI_ADC081C=m # CONFIG_TI_ADC0832 is not set # CONFIG_TI_ADC084S021 is not set @@ -7615,7 +7603,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m @@ -7757,7 +7744,6 @@ CONFIG_WLCORE_SPI=m # CONFIG_X25 is not set # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_X86_MCELOG_LEGACY=y -# CONFIG_X86_PTDUMP is not set CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index d8d046638..35d9dc37f 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -833,7 +833,6 @@ CONFIG_CAN_SUN4I=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAN_XILINXCAN=m -CONFIG_CAPI_AVM=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1508,7 +1507,6 @@ CONFIG_DRM_KOMEDA=m CONFIG_DRM_LIMA=m CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_LVDS_CODEC is not set -CONFIG_DRM_LVDS_ENCODER=m CONFIG_DRM=m CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_MCDE is not set @@ -1791,7 +1789,6 @@ CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -2034,11 +2031,6 @@ CONFIG_GENEVE=m # CONFIG_GENWQE is not set CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_GFS2_FS=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_CAPI=y -# CONFIG_GIGASET_DEBUG is not set -CONFIG_GIGASET_M101=m -CONFIG_GIGASET_M105=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -2305,8 +2297,6 @@ CONFIG_HWSPINLOCK_OMAP=m # CONFIG_HWSPINLOCK_STM32 is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set -CONFIG_HYSDN_CAPI=y -CONFIG_HYSDN=m CONFIG_HZ_1000=y # CONFIG_HZ_100 is not set # CONFIG_HZ_200 is not set @@ -2372,7 +2362,6 @@ CONFIG_I2C_NFORCE2=m CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_OMAP=y -# CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PIIX4 is not set CONFIG_I2C_PXA=m @@ -6557,7 +6546,6 @@ CONFIG_THERMAL_STATISTICS=y CONFIG_THERMAL=y CONFIG_THRUSTMASTER_FF=y # CONFIG_THUMB2_KERNEL is not set -# CONFIG_THUNDERBOLT is not set CONFIG_TI_ADC081C=m # CONFIG_TI_ADC0832 is not set # CONFIG_TI_ADC084S021 is not set @@ -7359,7 +7347,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 074f62d34..57537eedd 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -833,7 +833,6 @@ CONFIG_CAN_SUN4I=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAN_XILINXCAN=m -CONFIG_CAPI_AVM=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1501,7 +1500,6 @@ CONFIG_DRM_KOMEDA=m CONFIG_DRM_LIMA=m CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_LVDS_CODEC is not set -CONFIG_DRM_LVDS_ENCODER=m CONFIG_DRM=m CONFIG_DRM_MALI_DISPLAY=m # CONFIG_DRM_MCDE is not set @@ -1784,7 +1782,6 @@ CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -2019,11 +2016,6 @@ CONFIG_GENEVE=m # CONFIG_GENWQE is not set CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_GFS2_FS=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_CAPI=y -# CONFIG_GIGASET_DEBUG is not set -CONFIG_GIGASET_M101=m -CONFIG_GIGASET_M105=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -2290,8 +2282,6 @@ CONFIG_HWSPINLOCK_OMAP=m # CONFIG_HWSPINLOCK_STM32 is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set -CONFIG_HYSDN_CAPI=y -CONFIG_HYSDN=m CONFIG_HZ_1000=y # CONFIG_HZ_100 is not set # CONFIG_HZ_200 is not set @@ -2357,7 +2347,6 @@ CONFIG_I2C_NFORCE2=m CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_OMAP=y -# CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PIIX4 is not set CONFIG_I2C_PXA=m @@ -6536,7 +6525,6 @@ CONFIG_THERMAL_STATISTICS=y CONFIG_THERMAL=y CONFIG_THRUSTMASTER_FF=y # CONFIG_THUMB2_KERNEL is not set -# CONFIG_THUNDERBOLT is not set CONFIG_TI_ADC081C=m # CONFIG_TI_ADC0832 is not set # CONFIG_TI_ADC084S021 is not set @@ -7338,7 +7326,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m @@ -7479,7 +7466,6 @@ CONFIG_WLCORE_SPI=m # CONFIG_X25 is not set # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_X86_MCELOG_LEGACY=y -# CONFIG_X86_PTDUMP is not set CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 4036ceb27..147db7233 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -687,7 +687,6 @@ CONFIG_CAN_SOFTING=m # CONFIG_CAN_UCAN is not set CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m -CONFIG_CAPI_AVM=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1284,7 +1283,6 @@ CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_LVDS_CODEC is not set -# CONFIG_DRM_LVDS_ENCODER is not set CONFIG_DRM=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set CONFIG_DRM_MGAG200=m @@ -1549,7 +1547,6 @@ CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1794,11 +1791,6 @@ CONFIG_GEODE_WDT=m # CONFIG_GEOS is not set CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_GFS2_FS=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_CAPI=y -# CONFIG_GIGASET_DEBUG is not set -CONFIG_GIGASET_M101=m -CONFIG_GIGASET_M105=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -2073,8 +2065,6 @@ CONFIG_HYPERV_STORAGE=m # CONFIG_HYPERV_TESTING is not set CONFIG_HYPERV_UTILS=m CONFIG_HYPERV_VSOCKETS=m -CONFIG_HYSDN_CAPI=y -CONFIG_HYSDN=m CONFIG_HZ_1000=y # CONFIG_HZ_100 is not set # CONFIG_HZ_200 is not set @@ -2131,7 +2121,6 @@ CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set -CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PARPORT=m CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PIIX4=m @@ -5937,7 +5926,6 @@ CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set CONFIG_THINKPAD_ACPI_VIDEO=y CONFIG_THRUSTMASTER_FF=y -# CONFIG_THUNDERBOLT is not set CONFIG_THUNDERBOLT_NET=m # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC0832 is not set @@ -6615,7 +6603,6 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 8544266ca..ef96ead21 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -686,7 +686,6 @@ CONFIG_CAN_SOFTING=m # CONFIG_CAN_UCAN is not set CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m -CONFIG_CAPI_AVM=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1275,7 +1274,6 @@ CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_LVDS_CODEC is not set -# CONFIG_DRM_LVDS_ENCODER is not set CONFIG_DRM=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set CONFIG_DRM_MGAG200=m @@ -1540,7 +1538,6 @@ CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1777,11 +1774,6 @@ CONFIG_GEODE_WDT=m # CONFIG_GEOS is not set CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_GFS2_FS=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_CAPI=y -# CONFIG_GIGASET_DEBUG is not set -CONFIG_GIGASET_M101=m -CONFIG_GIGASET_M105=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -2056,8 +2048,6 @@ CONFIG_HYPERV_STORAGE=m # CONFIG_HYPERV_TESTING is not set CONFIG_HYPERV_UTILS=m CONFIG_HYPERV_VSOCKETS=m -CONFIG_HYSDN_CAPI=y -CONFIG_HYSDN=m CONFIG_HZ_1000=y # CONFIG_HZ_100 is not set # CONFIG_HZ_200 is not set @@ -2114,7 +2104,6 @@ CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set -CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PARPORT=m CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PIIX4=m @@ -5916,7 +5905,6 @@ CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set CONFIG_THINKPAD_ACPI_VIDEO=y CONFIG_THRUSTMASTER_FF=y -# CONFIG_THUNDERBOLT is not set CONFIG_THUNDERBOLT_NET=m # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC0832 is not set @@ -6594,7 +6582,6 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m @@ -6790,7 +6777,6 @@ CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y CONFIG_X86_POWERNOW_K8=m -# CONFIG_X86_PTDUMP is not set # CONFIG_X86_RDC321X is not set # CONFIG_X86_REBOOTFIXUPS is not set CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index d0f35835b..e3cc98ac8 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -624,7 +624,6 @@ CONFIG_CAN_SOFTING=m # CONFIG_CAN_UCAN is not set CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m -CONFIG_CAPI_AVM=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1176,7 +1175,6 @@ CONFIG_DRM_I2C_SIL164=m # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_LVDS_CODEC is not set -# CONFIG_DRM_LVDS_ENCODER is not set CONFIG_DRM=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set CONFIG_DRM_MGAG200=m @@ -1406,7 +1404,6 @@ CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1636,11 +1633,6 @@ CONFIG_GENWQE=m CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=1 CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_GFS2_FS=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_CAPI=y -# CONFIG_GIGASET_DEBUG is not set -CONFIG_GIGASET_M101=m -CONFIG_GIGASET_M105=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -1883,8 +1875,6 @@ CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set -CONFIG_HYSDN_CAPI=y -CONFIG_HYSDN=m CONFIG_HZ=100 # CONFIG_HZ_1000 is not set CONFIG_HZ_100=y @@ -1941,7 +1931,6 @@ CONFIG_I2C_NFORCE2=m CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_OPAL=m -# CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PIIX4 is not set # CONFIG_I2C_RK3X is not set @@ -5538,7 +5527,6 @@ CONFIG_THERMAL_STATISTICS=y # CONFIG_THERMAL_WRITABLE_TRIPS is not set CONFIG_THERMAL=y CONFIG_THRUSTMASTER_FF=y -# CONFIG_THUNDERBOLT is not set # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC0832 is not set # CONFIG_TI_ADC084S021 is not set @@ -6199,7 +6187,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 5f55cb70e..c7086fded 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -623,7 +623,6 @@ CONFIG_CAN_SOFTING=m # CONFIG_CAN_UCAN is not set CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m -CONFIG_CAPI_AVM=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1167,7 +1166,6 @@ CONFIG_DRM_I2C_SIL164=m # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_LVDS_CODEC is not set -# CONFIG_DRM_LVDS_ENCODER is not set CONFIG_DRM=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set CONFIG_DRM_MGAG200=m @@ -1397,7 +1395,6 @@ CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1619,11 +1616,6 @@ CONFIG_GENWQE=m CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=1 CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_GFS2_FS=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_CAPI=y -# CONFIG_GIGASET_DEBUG is not set -CONFIG_GIGASET_M101=m -CONFIG_GIGASET_M105=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -1866,8 +1858,6 @@ CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set -CONFIG_HYSDN_CAPI=y -CONFIG_HYSDN=m CONFIG_HZ=100 # CONFIG_HZ_1000 is not set CONFIG_HZ_100=y @@ -1924,7 +1914,6 @@ CONFIG_I2C_NFORCE2=m CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set CONFIG_I2C_OPAL=m -# CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PCA_PLATFORM=m # CONFIG_I2C_PIIX4 is not set # CONFIG_I2C_RK3X is not set @@ -5515,7 +5504,6 @@ CONFIG_THERMAL_STATISTICS=y # CONFIG_THERMAL_WRITABLE_TRIPS is not set CONFIG_THERMAL=y CONFIG_THRUSTMASTER_FF=y -# CONFIG_THUNDERBOLT is not set # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC0832 is not set # CONFIG_TI_ADC084S021 is not set @@ -6176,7 +6164,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m @@ -6317,7 +6304,6 @@ CONFIG_WLCORE_SPI=m # CONFIG_X25 is not set # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_X86_MCELOG_LEGACY=y -# CONFIG_X86_PTDUMP is not set CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 0ede3f850..660d9bf32 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -626,7 +626,6 @@ CONFIG_CAN_SOFTING=m # CONFIG_CAN_UCAN is not set CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m -CONFIG_CAPI_AVM=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1182,7 +1181,6 @@ CONFIG_DRM_I2C_ADV7533=y # CONFIG_DRM_LEGACY is not set # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set # CONFIG_DRM_LVDS_CODEC is not set -# CONFIG_DRM_LVDS_ENCODER is not set CONFIG_DRM=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set # CONFIG_DRM_MGAG200 is not set @@ -1412,7 +1410,6 @@ CONFIG_ETHERNET=y CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set CONFIG_EXPOLINE_AUTO=y # CONFIG_EXPOLINE_FULL is not set @@ -1633,11 +1630,6 @@ CONFIG_GENWQE=m CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0 CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_GFS2_FS=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_CAPI=y -# CONFIG_GIGASET_DEBUG is not set -CONFIG_GIGASET_M101=m -CONFIG_GIGASET_M105=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -1866,8 +1858,6 @@ CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set -CONFIG_HYSDN_CAPI=y -CONFIG_HYSDN=m # CONFIG_HZ_1000 is not set CONFIG_HZ_100=y # CONFIG_HZ_200 is not set @@ -1921,7 +1911,6 @@ CONFIG_I2C_MUX_MLXCPLD=m # CONFIG_I2C_NFORCE2_S4985 is not set CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set -# CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_PCA_PLATFORM is not set # CONFIG_I2C_PIIX4 is not set # CONFIG_I2C_RK3X is not set @@ -5471,7 +5460,6 @@ CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_STATISTICS=y # CONFIG_THERMAL_WRITABLE_TRIPS is not set CONFIG_THRUSTMASTER_FF=y -# CONFIG_THUNDERBOLT is not set # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC0832 is not set # CONFIG_TI_ADC084S021 is not set @@ -6135,7 +6123,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index eb10a5135..a67b987c1 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -625,7 +625,6 @@ CONFIG_CAN_SOFTING=m # CONFIG_CAN_UCAN is not set CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m -CONFIG_CAPI_AVM=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1173,7 +1172,6 @@ CONFIG_DRM_I2C_ADV7533=y # CONFIG_DRM_LEGACY is not set # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set # CONFIG_DRM_LVDS_CODEC is not set -# CONFIG_DRM_LVDS_ENCODER is not set CONFIG_DRM=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set # CONFIG_DRM_MGAG200 is not set @@ -1403,7 +1401,6 @@ CONFIG_ETHERNET=y CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set CONFIG_EXPOLINE_AUTO=y # CONFIG_EXPOLINE_FULL is not set @@ -1616,11 +1613,6 @@ CONFIG_GENWQE=m CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0 CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_GFS2_FS=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_CAPI=y -# CONFIG_GIGASET_DEBUG is not set -CONFIG_GIGASET_M101=m -CONFIG_GIGASET_M105=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -1849,8 +1841,6 @@ CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set -CONFIG_HYSDN_CAPI=y -CONFIG_HYSDN=m # CONFIG_HZ_1000 is not set CONFIG_HZ_100=y # CONFIG_HZ_200 is not set @@ -1904,7 +1894,6 @@ CONFIG_I2C_MUX_MLXCPLD=m # CONFIG_I2C_NFORCE2_S4985 is not set CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set -# CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_PCA_PLATFORM is not set # CONFIG_I2C_PIIX4 is not set # CONFIG_I2C_RK3X is not set @@ -5448,7 +5437,6 @@ CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_STATISTICS=y # CONFIG_THERMAL_WRITABLE_TRIPS is not set CONFIG_THRUSTMASTER_FF=y -# CONFIG_THUNDERBOLT is not set # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC0832 is not set # CONFIG_TI_ADC084S021 is not set @@ -6112,7 +6100,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y # CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m @@ -6256,7 +6243,6 @@ CONFIG_WLCORE_SPI=m # CONFIG_X25 is not set # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_X86_MCELOG_LEGACY=y -# CONFIG_X86_PTDUMP is not set CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_GRANT_DMA_ALLOC is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index f881412e6..5b723a745 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -695,7 +695,6 @@ CONFIG_CAN_SOFTING=m # CONFIG_CAN_UCAN is not set CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m -CONFIG_CAPI_AVM=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1322,7 +1321,6 @@ CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_LVDS_CODEC is not set -# CONFIG_DRM_LVDS_ENCODER is not set CONFIG_DRM=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set CONFIG_DRM_MGAG200=m @@ -1588,7 +1586,6 @@ CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1829,11 +1826,6 @@ CONFIG_GENEVE=m # CONFIG_GENWQE is not set CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_GFS2_FS=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_CAPI=y -# CONFIG_GIGASET_DEBUG is not set -CONFIG_GIGASET_M101=m -CONFIG_GIGASET_M105=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -2104,8 +2096,6 @@ CONFIG_HYPERV_STORAGE=m # CONFIG_HYPERV_TESTING is not set CONFIG_HYPERV_UTILS=m CONFIG_HYPERV_VSOCKETS=m -CONFIG_HYSDN_CAPI=y -CONFIG_HYSDN=m CONFIG_HZ_1000=y # CONFIG_HZ_100 is not set # CONFIG_HZ_200 is not set @@ -2164,7 +2154,6 @@ CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set -CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PARPORT=m CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PIIX4=m @@ -5992,7 +5981,6 @@ CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set CONFIG_THINKPAD_ACPI_VIDEO=y CONFIG_THRUSTMASTER_FF=y -CONFIG_THUNDERBOLT=m CONFIG_THUNDERBOLT_NET=m # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC0832 is not set @@ -6672,7 +6660,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 8453c588d..ae53caeb7 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -694,7 +694,6 @@ CONFIG_CAN_SOFTING=m # CONFIG_CAN_UCAN is not set CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m -CONFIG_CAPI_AVM=y # CONFIG_CAPI_TRACE is not set CONFIG_CARDBUS=y CONFIG_CARDMAN_4000=m @@ -1313,7 +1312,6 @@ CONFIG_DRM_I915_USERPTR=y # CONFIG_DRM_LEGACY is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_LVDS_CODEC is not set -# CONFIG_DRM_LVDS_ENCODER is not set CONFIG_DRM=m # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set CONFIG_DRM_MGAG200=m @@ -1579,7 +1577,6 @@ CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y # CONFIG_EUROTECH_WDT is not set # CONFIG_EVM is not set -# CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set # CONFIG_EXPOLINE_AUTO is not set CONFIG_EXPOLINE_FULL=y @@ -1812,11 +1809,6 @@ CONFIG_GENEVE=m # CONFIG_GENWQE is not set CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_GFS2_FS=m -CONFIG_GIGASET_BASE=m -CONFIG_GIGASET_CAPI=y -# CONFIG_GIGASET_DEBUG is not set -CONFIG_GIGASET_M101=m -CONFIG_GIGASET_M105=m # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -2087,8 +2079,6 @@ CONFIG_HYPERV_STORAGE=m # CONFIG_HYPERV_TESTING is not set CONFIG_HYPERV_UTILS=m CONFIG_HYPERV_VSOCKETS=m -CONFIG_HYSDN_CAPI=y -CONFIG_HYSDN=m CONFIG_HZ_1000=y # CONFIG_HZ_100 is not set # CONFIG_HZ_200 is not set @@ -2147,7 +2137,6 @@ CONFIG_I2C_NFORCE2=m CONFIG_I2C_NFORCE2_S4985=m CONFIG_I2C_NVIDIA_GPU=m # CONFIG_I2C_OCORES is not set -CONFIG_I2C_PARPORT_LIGHT=m CONFIG_I2C_PARPORT=m CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PIIX4=m @@ -5971,7 +5960,6 @@ CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set CONFIG_THINKPAD_ACPI_VIDEO=y CONFIG_THRUSTMASTER_FF=y -CONFIG_THUNDERBOLT=m CONFIG_THUNDERBOLT_NET=m # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC0832 is not set @@ -6651,7 +6639,6 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m @@ -6841,7 +6828,6 @@ CONFIG_X86_PLATFORM_DEVICES=y CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y CONFIG_X86_POWERNOW_K8=m -# CONFIG_X86_PTDUMP is not set CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y CONFIG_X86_RESERVE_LOW=64 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set diff --git a/kernel.spec b/kernel.spec index 1c158dae2..66591bb5a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -115,7 +115,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 3 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -196,7 +196,7 @@ Summary: The Linux kernel # # gcov support -%define with_gcov %{?_with_gcov: 1} %{?!_with_gcov: 0} +%define with_gcov %{?_with_gcov:1}%{?!_with_gcov:0} # # ipa_clone support @@ -208,7 +208,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 %if 0%{?fedora} # Kernel headers are being split out into a separate package @@ -669,7 +669,8 @@ Source15: secureboot_ppc.cer %define pesign_name redhatsecureboot303 %endif -%else # released_kernel +# released_kernel +%else Source12: redhatsecurebootca2.cer Source13: redhatsecureboot003.cer @@ -678,7 +679,8 @@ Source13: redhatsecureboot003.cer %define secureboot_key %{SOURCE13} %define pesign_name redhatsecureboot003 -%endif # released_kernel +# released_kernel +%endif Source22: mod-extra.list.rhel Source16: mod-extra.list.fedora @@ -999,8 +1001,8 @@ This package provides debug information for the perf python bindings. # the python_sitearch macro should already be defined from above %{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{python3_sitearch}/perf.*so(\.debug)?|XXX' -o python3-perf-debuginfo.list} - -%endif # with_perf +# with_perf +%endif %if %{with_tools} %package -n kernel-tools @@ -1055,7 +1057,8 @@ This package provides debug information for package kernel-tools. # of matching the pattern against the symlinks file. %{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|XXX' -o kernel-tools-debuginfo.list} -%endif # with_tools +# with_tools +%endif %if %{with_bpftool} @@ -1076,9 +1079,11 @@ This package provides debug information for the bpftool package. %{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_sbindir}/bpftool(\.debug)?|XXX' -o bpftool-debuginfo.list} -%endif # with_bpftool +# with_bpftool +%endif %if %{with_selftests} + %package selftests-internal Summary: Kernel samples and selftests License: GPLv2 @@ -1086,12 +1091,14 @@ Requires: binutils, bpftool, iproute-tc, nmap-ncat Requires: kernel-modules-internal = %{version}-%{release} %description selftests-internal Kernel sample programs and selftests. -%{nil} + # Note that this pattern only works right to match the .build-id # symlinks because of the trailing nonmatching alternation and # the leading .*, because of find-debuginfo.sh's buggy handling # of matching the pattern against the symlinks file. %{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_libexecdir}/(ksamples|kselftests)/.*|XXX' -o selftests-debuginfo.list} + +# with_selftests %endif %if %{with_gcov} @@ -1289,6 +1296,7 @@ Cortex-A15 devices with LPAE and HW virtualisation support %description zfcpdump-core The kernel package contains the Linux kernel (vmlinuz) for use by the zfcpdump infrastructure. +# with_zfcpdump %endif %define variant_summary The Linux kernel compiled with extra debugging enabled @@ -1813,7 +1821,9 @@ BuildKernel() { if [ "$KernelExtension" == "gz" ]; then gzip -f9 $SignImage fi + # signkernel %endif + $CopyKernel $KernelImage \ $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer @@ -1828,7 +1838,7 @@ BuildKernel() { if [ $DoModules -eq 1 ]; then # Override $(mod-fw) because we don't want it to install any firmware # we'll get it from the linux-firmware package and we don't want conflicts - %{make} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT %{?_smp_mflags} modules_install KERNELRELEASE=$KernelVer mod-fw= + %{make} %{?_smp_mflags} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT %{?_smp_mflags} modules_install KERNELRELEASE=$KernelVer mod-fw= fi %if %{with_gcov} @@ -1867,6 +1877,7 @@ BuildKernel() { mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/internal mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates + mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/weak-updates # CONFIG_KERNEL_HEADER_TEST generates some extra files in the process of # testing so just delete find . -name *.h.s -delete @@ -1887,13 +1898,15 @@ BuildKernel() { echo "**** GENERATING kernel ABI metadata ****" gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-$KernelVer.gz cp $RPM_BUILD_ROOT/boot/symvers-$KernelVer.gz $RPM_BUILD_ROOT/lib/modules/$KernelVer/symvers.gz + %if %{with_kabichk} echo "**** kABI checking is enabled in kernel SPEC file. ****" chmod 0755 $RPM_SOURCE_DIR/check-kabi if [ -e $RPM_SOURCE_DIR/Module.kabi_%{_target_cpu}$Flavour ]; then cp $RPM_SOURCE_DIR/Module.kabi_%{_target_cpu}$Flavour $RPM_BUILD_ROOT/Module.kabi $RPM_SOURCE_DIR/check-kabi -k $RPM_BUILD_ROOT/Module.kabi -s Module.symvers || exit 1 - rm $RPM_BUILD_ROOT/Module.kabi # for now, don't keep it around. + # for now, don't keep it around. + rm $RPM_BUILD_ROOT/Module.kabi else echo "**** NOTE: Cannot find reference Module.kabi file. ****" fi @@ -1904,7 +1917,8 @@ BuildKernel() { if [ -e $RPM_SOURCE_DIR/Module.kabi_dup_%{_target_cpu}$Flavour ]; then cp $RPM_SOURCE_DIR/Module.kabi_dup_%{_target_cpu}$Flavour $RPM_BUILD_ROOT/Module.kabi $RPM_SOURCE_DIR/check-kabi -k $RPM_BUILD_ROOT/Module.kabi -s Module.symvers || exit 1 - rm $RPM_BUILD_ROOT/Module.kabi # for now, don't keep it around. + # for now, don't keep it around. + rm $RPM_BUILD_ROOT/Module.kabi else echo "**** NOTE: Cannot find DUP reference Module.kabi file. ****" fi @@ -1959,6 +1973,7 @@ BuildKernel() { %endif # then drop all but the needed Makefiles/Kconfig files + rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Documentation rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build @@ -2095,10 +2110,9 @@ BuildKernel() { mkdir restore cp -r lib/modules/$KernelVer/* restore/. - # don't include anything going into k-m-e in the file lists + # don't include anything going into k-m-e and k-m-i in the file lists rm -rf lib/modules/$KernelVer/{extra,internal} - if [ $DoModules -eq 1 ]; then # Find all the module files and filter them out into the core and # modules lists. This actually removes anything going into -modules @@ -2243,28 +2257,34 @@ chmod +x tools/perf/check-headers.sh %{perf_make} DESTDIR=$RPM_BUILD_ROOT all %endif +%global tools_make \ + %{make} CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" V=1 + %if %{with_tools} %ifarch %{cpupowerarchs} # cpupower # make sure version-gen.sh is executable. chmod +x tools/power/cpupower/utils/version-gen.sh -%{make} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false +%{tools_make} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false %ifarch x86_64 pushd tools/power/cpupower/debug/x86_64 - %{make} %{?_smp_mflags} centrino-decode powernow-k8-decode + %{tools_make} %{?_smp_mflags} centrino-decode powernow-k8-decode popd %endif %ifarch x86_64 pushd tools/power/x86/x86_energy_perf_policy/ - %{make} + %{tools_make} popd pushd tools/power/x86/turbostat + %{tools_make} + popd + pushd tools/power/x86/intel-speed-select %{make} popd -%endif #turbostat/x86_energy_perf_policy +%endif %endif pushd tools/thermal/tmon/ -%{make} +%{tools_make} popd pushd tools/iio/ %{make} @@ -2293,7 +2313,7 @@ popd %if %{with_doc} # Make the HTML pages. -make htmldocs || %{doc_build_fail} +make PYTHON=/usr/bin/python3 htmldocs || %{doc_build_fail} # sometimes non-world-readable files sneak into the kernel source tree chmod -R a=rX Documentation @@ -2385,6 +2405,7 @@ docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion} mkdir -p $docdir tar -h -f - --exclude=man --exclude='.*' -c Documentation | tar xf - -C $docdir +# with_doc %endif # We have to do the headers install before the tools install because the @@ -2427,8 +2448,10 @@ rm -rf $RPM_BUILD_ROOT/usr/tmp-headers # kabi directory INSTALL_KABI_PATH=$RPM_BUILD_ROOT/lib/modules/ mkdir -p $INSTALL_KABI_PATH + # install kabi releases directories tar xjvf %{SOURCE300} -C $INSTALL_KABI_PATH +# with_kernel_abi_whitelists %endif %if %{with_perf} @@ -2478,14 +2501,17 @@ install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower %ifarch x86_64 mkdir -p %{buildroot}%{_mandir}/man8 pushd tools/power/x86/x86_energy_perf_policy - make DESTDIR=%{buildroot} install + %{tools_make} DESTDIR=%{buildroot} install popd pushd tools/power/x86/turbostat - make DESTDIR=%{buildroot} install + %{tools_make} DESTDIR=%{buildroot} install + popd + pushd tools/power/x86/intel-speed-select + %{tools_make} CFLAGS+="-D_GNU_SOURCE -Iinclude" DESTDIR=%{buildroot} install popd -%endif #turbostat/x86_energy_perf_policy +%endif pushd tools/thermal/tmon -make INSTALL_ROOT=%{buildroot} install +%{tools_make} INSTALL_ROOT=%{buildroot} install popd pushd tools/iio make DESTDIR=%{buildroot} install @@ -2551,6 +2577,18 @@ find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/ popd %endif +# We have to do the headers checksum calculation after the tools install because +# these might end up installing their own set of headers on top of kernel's +%if %{with_headers} +# compute a content hash to export as Provides: kernel-headers-checksum +HEADERS_CHKSUM=$(export LC_ALL=C; find $RPM_BUILD_ROOT/usr/include -type f -name "*.h" \ + ! -path $RPM_BUILD_ROOT/usr/include/linux/version.h | \ + sort | xargs cat | sha1sum - | cut -f 1 -d ' '); +# export the checksum via usr/include/linux/version.h, so the dynamic +# find-provides can grab the hash to update it accordingly +echo "#define KERNEL_HEADERS_CHECKSUM \"$HEADERS_CHKSUM\"" >> $RPM_BUILD_ROOT/usr/include/linux/version.h +%endif + ### ### clean ### @@ -2634,6 +2672,10 @@ fi\ # %define kernel_variant_posttrans() \ %{expand:%%posttrans %{?1:%{1}-}core}\ +if [ -x %{_sbindir}/weak-modules ]\ +then\ + %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ +fi\ /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ %{nil} @@ -2663,6 +2705,10 @@ fi}\ %define kernel_variant_preun() \ %{expand:%%preun %{?1:%{1}-}core}\ /bin/kernel-install remove %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ +if [ -x %{_sbindir}/weak-modules ]\ +then\ + %{_sbindir}/weak-modules --remove-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ +fi\ %{nil} %kernel_variant_preun @@ -2744,7 +2790,8 @@ fi %files -f python3-perf-debuginfo.list -n python3-perf-debuginfo %endif -%endif # with_perf +# with_perf +%endif %if %{with_tools} %files -n kernel-tools @@ -2764,8 +2811,10 @@ fi %{_mandir}/man8/x86_energy_perf_policy* %{_bindir}/turbostat %{_mandir}/man8/turbostat* +%{_bindir}/intel-speed-select +%endif +# cpupowerarchs %endif -%endif # cpupowerarchs %{_bindir}/tmon %{_bindir}/iio_event_monitor %{_bindir}/iio_generic_buffer @@ -2789,13 +2838,15 @@ fi %{_libdir}/libcpupower.so %{_includedir}/cpufreq.h %endif -%endif # with_tools +# with_tools +%endif %if %{with_bpftool} %files -n bpftool %{_sbindir}/bpftool %{_sysconfdir}/bash_completion.d/bpftool %{_mandir}/man8/bpftool-cgroup.8.gz +%{_mandir}/man8/bpftool-gen.8.gz %{_mandir}/man8/bpftool-map.8.gz %{_mandir}/man8/bpftool-prog.8.gz %{_mandir}/man8/bpftool-perf.8.gz @@ -2865,7 +2916,13 @@ fi /lib/modules/%{KVERREL}%{?3:+%{3}}/source\ /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\ /lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\ -%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\ +/lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\ +%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/kernel-signing-ca.cer\ +%ifarch s390x ppc64le\ +%if 0%{!?4:1}\ +%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/%{signing_key_filename} \ +%endif\ +%endif\ %if %{1}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\ %endif\ @@ -2913,6 +2970,12 @@ fi # # %changelog +* Tue Feb 25 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc3.git1.1 +- Linux v5.6-rc3-26-g63623fd44972 + +* Tue Feb 25 2020 Jeremy Cline <jcline@redhat.com> +- Reenable debugging options. + * Mon Feb 24 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc3.git0.1 - Linux v5.6-rc3 @@ -1,2 +1,3 @@ SHA512 (linux-5.5.tar.xz) = fa74fdabb5e63384a39e54da05b86a9ae9ea16179524b041fbbdffc7177e80b53600ae98d76be127ba216148f9dc55fe07ab20637e22c6d6030cb4aa09eb2f86 SHA512 (patch-5.6-rc3.xz) = e12599c53db58b291864f2fdd0fba49b7f0bffa6c3878e8ff99367f7089e3310cb14064d155637a1cb957cbd76cb2af596ea97946ce205e0628e70642aa20a98 +SHA512 (patch-5.6-rc3-git1.xz) = daecd1408b0c07a39dd942cb91e1f342e6237a23cce8fbb7be380f0a63b79355ad11711bf078e2ed5bd6ed76489d98c44e15199079100c7e768ecc0ee02c9753 |