diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-15 19:03:10 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-15 19:03:10 +0200 |
commit | 34935e45f6bb229743089c3f5ac15621829c844a (patch) | |
tree | f661574a8617c0e23631cca49a012810d466255b | |
parent | d6fd520355f1d3a9fd806285190654fb4aed84b6 (diff) | |
parent | ac4ad6bdf334a0200bb64532d377fb4fddd5614a (diff) | |
download | kernel-34935e45f6bb229743089c3f5ac15621829c844a.tar.gz kernel-34935e45f6bb229743089c3f5ac15621829c844a.tar.xz kernel-34935e45f6bb229743089c3f5ac15621829c844a.zip |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc24
39 files changed, 159 insertions, 54 deletions
diff --git a/baseconfig/CONFIG_JOYSTICK_PSXPAD_SPI b/baseconfig/CONFIG_JOYSTICK_PSXPAD_SPI new file mode 100644 index 000000000..d66d2b113 --- /dev/null +++ b/baseconfig/CONFIG_JOYSTICK_PSXPAD_SPI @@ -0,0 +1 @@ +CONFIG_JOYSTICK_PSXPAD_SPI=m diff --git a/baseconfig/CONFIG_JOYSTICK_PSXPAD_SPI_FF b/baseconfig/CONFIG_JOYSTICK_PSXPAD_SPI_FF new file mode 100644 index 000000000..c534b358b --- /dev/null +++ b/baseconfig/CONFIG_JOYSTICK_PSXPAD_SPI_FF @@ -0,0 +1 @@ +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y diff --git a/baseconfig/CONFIG_PCI_MSI_IRQ_DOMAIN b/baseconfig/CONFIG_PCI_MSI_IRQ_DOMAIN new file mode 100644 index 000000000..90bf4c7ca --- /dev/null +++ b/baseconfig/CONFIG_PCI_MSI_IRQ_DOMAIN @@ -0,0 +1 @@ +CONFIG_PCI_MSI_IRQ_DOMAIN=y diff --git a/baseconfig/CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS b/baseconfig/CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS new file mode 100644 index 000000000..9288765d6 --- /dev/null +++ b/baseconfig/CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS @@ -0,0 +1 @@ +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 diff --git a/baseconfig/CONFIG_UBIFS_FS_SECURITY b/baseconfig/CONFIG_UBIFS_FS_SECURITY new file mode 100644 index 000000000..cb238b9c2 --- /dev/null +++ b/baseconfig/CONFIG_UBIFS_FS_SECURITY @@ -0,0 +1 @@ +CONFIG_UBIFS_FS_SECURITY=y diff --git a/baseconfig/arm/CONFIG_BATTERY_AXP20X b/baseconfig/arm/CONFIG_BATTERY_AXP20X new file mode 100644 index 000000000..75591a277 --- /dev/null +++ b/baseconfig/arm/CONFIG_BATTERY_AXP20X @@ -0,0 +1 @@ +CONFIG_BATTERY_AXP20X=m diff --git a/baseconfig/arm/CONFIG_BCM2835_THERMAL b/baseconfig/arm/CONFIG_BCM2835_THERMAL new file mode 100644 index 000000000..a6e3c0a6d --- /dev/null +++ b/baseconfig/arm/CONFIG_BCM2835_THERMAL @@ -0,0 +1 @@ +CONFIG_BCM2835_THERMAL=m diff --git a/baseconfig/arm/CONFIG_PCIE_DW_HOST b/baseconfig/arm/CONFIG_PCIE_DW_HOST new file mode 100644 index 000000000..6aecdd9c1 --- /dev/null +++ b/baseconfig/arm/CONFIG_PCIE_DW_HOST @@ -0,0 +1 @@ +CONFIG_PCIE_DW_HOST=y diff --git a/baseconfig/powerpc/CONFIG_PCI_MSI_IRQ_DOMAIN b/baseconfig/powerpc/CONFIG_PCI_MSI_IRQ_DOMAIN new file mode 100644 index 000000000..2d1ad5bb1 --- /dev/null +++ b/baseconfig/powerpc/CONFIG_PCI_MSI_IRQ_DOMAIN @@ -0,0 +1 @@ +# CONFIG_PCI_MSI_IRQ_DOMAIN is not set diff --git a/baseconfig/powerpc/CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN b/baseconfig/powerpc/CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN new file mode 100644 index 000000000..46354e6a9 --- /dev/null +++ b/baseconfig/powerpc/CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN @@ -0,0 +1 @@ +CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN=y diff --git a/baseconfig/powerpc/CONFIG_PPC_DT_CPU_FTRS b/baseconfig/powerpc/CONFIG_PPC_DT_CPU_FTRS new file mode 100644 index 000000000..aa61b1ff3 --- /dev/null +++ b/baseconfig/powerpc/CONFIG_PPC_DT_CPU_FTRS @@ -0,0 +1 @@ +CONFIG_PPC_DT_CPU_FTRS=y diff --git a/baseconfig/powerpc/CONFIG_USB_OHCI_HCD_PCI b/baseconfig/powerpc/CONFIG_USB_OHCI_HCD_PCI deleted file mode 100644 index a78b62cb5..000000000 --- a/baseconfig/powerpc/CONFIG_USB_OHCI_HCD_PCI +++ /dev/null @@ -1 +0,0 @@ -CONFIG_USB_OHCI_HCD_PCI=y diff --git a/baseconfig/s390x/CONFIG_PCI_MSI_IRQ_DOMAIN b/baseconfig/s390x/CONFIG_PCI_MSI_IRQ_DOMAIN new file mode 100644 index 000000000..2d1ad5bb1 --- /dev/null +++ b/baseconfig/s390x/CONFIG_PCI_MSI_IRQ_DOMAIN @@ -0,0 +1 @@ +# CONFIG_PCI_MSI_IRQ_DOMAIN is not set diff --git a/baseconfig/x86/CONFIG_DRM_I915_DEBUG_VBLANK_EVADE b/baseconfig/x86/CONFIG_DRM_I915_DEBUG_VBLANK_EVADE new file mode 100644 index 000000000..d48518abd --- /dev/null +++ b/baseconfig/x86/CONFIG_DRM_I915_DEBUG_VBLANK_EVADE @@ -0,0 +1 @@ +# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set diff --git a/filter-armv7hl.sh b/filter-armv7hl.sh index 2141dfef4..364a01a6d 100644 --- a/filter-armv7hl.sh +++ b/filter-armv7hl.sh @@ -15,4 +15,4 @@ ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco d drmdrvs="amd armada bridge ast exynos i2c imx mgag200 msm omapdrm panel nouveau radeon rockchip tegra tilcdc via" -singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr vc4" +singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr vc4 sti-drm" @@ -1 +1 @@ -09d79d103371b1b7ea70ea7f9c05ac207ef22f5d +2ea659a9ef488125eb46da6eb571de5eae5c43f6 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 2dcba8ef7..eb4eba4a8 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -455,6 +455,7 @@ CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_NC=y +CONFIG_BATTERY_AXP20X=m # CONFIG_BATTERY_BQ27XXX is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2780 is not set @@ -473,6 +474,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set CONFIG_BCACHE=m CONFIG_BCM2835_MBOX=y +CONFIG_BCM2835_THERMAL=m # CONFIG_BCM2835_VCHIQ is not set CONFIG_BCM2835_WDT=m CONFIG_BCM63XX_PHY=m @@ -2512,6 +2514,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3894,6 +3898,7 @@ CONFIG_PCIE_ARMADA_8K=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y CONFIG_PCIE_DPC=y +CONFIG_PCIE_DW_HOST=y # CONFIG_PCIE_DW_PLAT is not set CONFIG_PCIE_DW=y CONFIG_PCIE_ECRC=y @@ -3912,6 +3917,7 @@ CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_HOST_THUNDER_ECAM=y CONFIG_PCI_HOST_THUNDER_PEM=y CONFIG_PCI_IOV=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y CONFIG_PCI_MVEBU=y CONFIG_PCI_PASID=y @@ -5502,6 +5508,7 @@ CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5658,6 +5665,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 803a2b2cb..2a01f0ed3 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -455,6 +455,7 @@ CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_NC=y +CONFIG_BATTERY_AXP20X=m # CONFIG_BATTERY_BQ27XXX is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2780 is not set @@ -473,6 +474,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set CONFIG_BCACHE=m CONFIG_BCM2835_MBOX=y +CONFIG_BCM2835_THERMAL=m # CONFIG_BCM2835_VCHIQ is not set CONFIG_BCM2835_WDT=m CONFIG_BCM63XX_PHY=m @@ -2495,6 +2497,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3873,6 +3877,7 @@ CONFIG_PCIE_ARMADA_8K=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y CONFIG_PCIE_DPC=y +CONFIG_PCIE_DW_HOST=y # CONFIG_PCIE_DW_PLAT is not set CONFIG_PCIE_DW=y CONFIG_PCIE_ECRC=y @@ -3891,6 +3896,7 @@ CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_HOST_THUNDER_ECAM=y CONFIG_PCI_HOST_THUNDER_PEM=y CONFIG_PCI_IOV=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y CONFIG_PCI_MVEBU=y CONFIG_PCI_PASID=y @@ -5479,6 +5485,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5635,6 +5642,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 43af1bf20..6f1247cba 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -496,6 +496,7 @@ CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_NC=y +CONFIG_BATTERY_AXP20X=m CONFIG_BATTERY_BQ27XXX_I2C=m CONFIG_BATTERY_BQ27XXX=m CONFIG_BATTERY_DA9052=m @@ -518,6 +519,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set CONFIG_BCACHE=m CONFIG_BCM2835_MBOX=y +CONFIG_BCM2835_THERMAL=m # CONFIG_BCM2835_VCHIQ is not set CONFIG_BCM2835_WDT=m CONFIG_BCM63XX_PHY=m @@ -2686,6 +2688,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -4192,6 +4196,7 @@ CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y CONFIG_PCIE_DPC=y +CONFIG_PCIE_DW_HOST=y # CONFIG_PCIE_DW_PLAT is not set CONFIG_PCIE_DW=y CONFIG_PCIE_ECRC=y @@ -4211,6 +4216,7 @@ CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_IMX6=y CONFIG_PCI_IOV=y # CONFIG_PCI_LAYERSCAPE is not set +CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y CONFIG_PCI_MVEBU=y CONFIG_PCI_PASID=y @@ -6002,6 +6008,7 @@ CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -6180,6 +6187,7 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_ZLIB=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index eaa3f9407..174de9ba7 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -478,6 +478,7 @@ CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_NC=y +CONFIG_BATTERY_AXP20X=m # CONFIG_BATTERY_BQ27XXX is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2780 is not set @@ -496,6 +497,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set CONFIG_BCACHE=m CONFIG_BCM2835_MBOX=y +CONFIG_BCM2835_THERMAL=m # CONFIG_BCM2835_VCHIQ is not set CONFIG_BCM2835_WDT=m CONFIG_BCM63XX_PHY=m @@ -2565,6 +2567,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3987,6 +3991,7 @@ CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y CONFIG_PCIE_DPC=y +CONFIG_PCIE_DW_HOST=y # CONFIG_PCIE_DW_PLAT is not set CONFIG_PCIE_DW=y CONFIG_PCIE_ECRC=y @@ -4004,6 +4009,7 @@ CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_IOV=y CONFIG_PCI_KEYSTONE=y # CONFIG_PCI_LAYERSCAPE is not set +CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y CONFIG_PCI_MVEBU=y CONFIG_PCI_PASID=y @@ -5624,6 +5630,7 @@ CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5786,6 +5793,7 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_ZLIB=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 0ec38af52..4204f2e52 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -477,6 +477,7 @@ CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_NC=y +CONFIG_BATTERY_AXP20X=m # CONFIG_BATTERY_BQ27XXX is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2780 is not set @@ -495,6 +496,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set CONFIG_BCACHE=m CONFIG_BCM2835_MBOX=y +CONFIG_BCM2835_THERMAL=m # CONFIG_BCM2835_VCHIQ is not set CONFIG_BCM2835_WDT=m CONFIG_BCM63XX_PHY=m @@ -2548,6 +2550,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3966,6 +3970,7 @@ CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y CONFIG_PCIE_DPC=y +CONFIG_PCIE_DW_HOST=y # CONFIG_PCIE_DW_PLAT is not set CONFIG_PCIE_DW=y CONFIG_PCIE_ECRC=y @@ -3983,6 +3988,7 @@ CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_IOV=y CONFIG_PCI_KEYSTONE=y # CONFIG_PCI_LAYERSCAPE is not set +CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y CONFIG_PCI_MVEBU=y CONFIG_PCI_PASID=y @@ -5601,6 +5607,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5763,6 +5770,7 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_ZLIB=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index fc5691c15..1db8e0725 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -495,6 +495,7 @@ CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_NC=y +CONFIG_BATTERY_AXP20X=m CONFIG_BATTERY_BQ27XXX_I2C=m CONFIG_BATTERY_BQ27XXX=m CONFIG_BATTERY_DA9052=m @@ -517,6 +518,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set CONFIG_BCACHE=m CONFIG_BCM2835_MBOX=y +CONFIG_BCM2835_THERMAL=m # CONFIG_BCM2835_VCHIQ is not set CONFIG_BCM2835_WDT=m CONFIG_BCM63XX_PHY=m @@ -2669,6 +2671,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -4171,6 +4175,7 @@ CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y CONFIG_PCIE_DPC=y +CONFIG_PCIE_DW_HOST=y # CONFIG_PCIE_DW_PLAT is not set CONFIG_PCIE_DW=y CONFIG_PCIE_ECRC=y @@ -4190,6 +4195,7 @@ CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_IMX6=y CONFIG_PCI_IOV=y # CONFIG_PCI_LAYERSCAPE is not set +CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y CONFIG_PCI_MVEBU=y CONFIG_PCI_PASID=y @@ -5979,6 +5985,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -6157,6 +6164,7 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_ZLIB=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 9a7e6be61..457381a53 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -1118,6 +1118,7 @@ CONFIG_DRM_I2C_SIL164=m # CONFIG_DRM_I915_ALPHA_SUPPORT is not set CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y +# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set CONFIG_DRM_I915_GVT_KVMGT=m CONFIG_DRM_I915_GVT=y CONFIG_DRM_I915=m @@ -2430,6 +2431,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3796,6 +3799,7 @@ CONFIG_PCI_HERMES=m CONFIG_PCI_HYPERV=m CONFIG_PCI_IOV=y CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y CONFIG_PCI_PASID=y CONFIG_PCIPCWATCHDOG=m @@ -5192,6 +5196,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set CONFIG_THERMAL_GOV_BANG_BANG=y CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5352,6 +5357,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index ec5cc3ea5..e06d48d54 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -1129,6 +1129,7 @@ CONFIG_DRM_I2C_SIL164=m # CONFIG_DRM_I915_ALPHA_SUPPORT is not set CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y +# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set CONFIG_DRM_I915_GVT_KVMGT=m CONFIG_DRM_I915_GVT=y CONFIG_DRM_I915=m @@ -2448,6 +2449,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3816,6 +3819,7 @@ CONFIG_PCI_HERMES=m CONFIG_PCI_HYPERV=m CONFIG_PCI_IOV=y CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y CONFIG_PCI_PASID=y CONFIG_PCIPCWATCHDOG=m @@ -5214,6 +5218,7 @@ CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set CONFIG_THERMAL_GOV_BANG_BANG=y CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5374,6 +5379,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index b43dd1282..26c737024 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -1129,6 +1129,7 @@ CONFIG_DRM_I2C_SIL164=m # CONFIG_DRM_I915_ALPHA_SUPPORT is not set CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y +# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set CONFIG_DRM_I915_GVT_KVMGT=m CONFIG_DRM_I915_GVT=y CONFIG_DRM_I915=m @@ -2448,6 +2449,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3816,6 +3819,7 @@ CONFIG_PCI_HERMES=m CONFIG_PCI_HYPERV=m CONFIG_PCI_IOV=y CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y CONFIG_PCI_PASID=y CONFIG_PCIPCWATCHDOG=m @@ -5214,6 +5218,7 @@ CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set CONFIG_THERMAL_GOV_BANG_BANG=y CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5374,6 +5379,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-i686.config b/kernel-i686.config index 0793af75e..a426171d1 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1118,6 +1118,7 @@ CONFIG_DRM_I2C_SIL164=m # CONFIG_DRM_I915_ALPHA_SUPPORT is not set CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y +# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set CONFIG_DRM_I915_GVT_KVMGT=m CONFIG_DRM_I915_GVT=y CONFIG_DRM_I915=m @@ -2430,6 +2431,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3796,6 +3799,7 @@ CONFIG_PCI_HERMES=m CONFIG_PCI_HYPERV=m CONFIG_PCI_IOV=y CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y CONFIG_PCI_PASID=y CONFIG_PCIPCWATCHDOG=m @@ -5192,6 +5196,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set CONFIG_THERMAL_GOV_BANG_BANG=y CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5352,6 +5357,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index d38c12230..ceac2e602 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -2305,6 +2305,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3624,6 +3626,7 @@ CONFIG_PCI_ENDPOINT=y CONFIG_PCIE_PTM=y CONFIG_PCI_HERMES=m CONFIG_PCI_IOV=y +# CONFIG_PCI_MSI_IRQ_DOMAIN is not set CONFIG_PCI_MSI=y CONFIG_PCI_PASID=y CONFIG_PCIPCWATCHDOG=m @@ -3723,8 +3726,10 @@ CONFIG_PPC64=y # CONFIG_PPC_83xx is not set # CONFIG_PPC_86xx is not set # CONFIG_PPC_CELL is not set +CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN=y CONFIG_PPC_DENORMALISATION=y CONFIG_PPC_DISABLE_WERROR=y +CONFIG_PPC_DT_CPU_FTRS=y # CONFIG_PPC_EARLY_DEBUG is not set CONFIG_PPC_EMULATED_STATS=y # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set @@ -5014,6 +5019,7 @@ CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5163,6 +5169,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 39db650ab..40d628a79 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -2287,6 +2287,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3602,6 +3604,7 @@ CONFIG_PCI_ENDPOINT=y CONFIG_PCIE_PTM=y CONFIG_PCI_HERMES=m CONFIG_PCI_IOV=y +# CONFIG_PCI_MSI_IRQ_DOMAIN is not set CONFIG_PCI_MSI=y CONFIG_PCI_PASID=y CONFIG_PCIPCWATCHDOG=m @@ -3701,8 +3704,10 @@ CONFIG_PPC64=y # CONFIG_PPC_83xx is not set # CONFIG_PPC_86xx is not set # CONFIG_PPC_CELL is not set +CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN=y CONFIG_PPC_DENORMALISATION=y CONFIG_PPC_DISABLE_WERROR=y +CONFIG_PPC_DT_CPU_FTRS=y # CONFIG_PPC_EARLY_DEBUG is not set CONFIG_PPC_EMULATED_STATS=y # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set @@ -4990,6 +4995,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5139,6 +5145,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index a903e2327..ac4ade338 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2251,6 +2251,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3567,6 +3569,7 @@ CONFIG_PCI_ENDPOINT=y CONFIG_PCIE_PTM=y CONFIG_PCI_HERMES=m CONFIG_PCI_IOV=y +# CONFIG_PCI_MSI_IRQ_DOMAIN is not set CONFIG_PCI_MSI=y CONFIG_PCI_PASID=y CONFIG_PCIPCWATCHDOG=m @@ -3663,8 +3666,10 @@ CONFIG_PPC64=y # CONFIG_PPC_83xx is not set # CONFIG_PPC_86xx is not set # CONFIG_PPC_CELL is not set +CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN=y CONFIG_PPC_DENORMALISATION=y CONFIG_PPC_DISABLE_WERROR=y +CONFIG_PPC_DT_CPU_FTRS=y # CONFIG_PPC_EARLY_DEBUG is not set CONFIG_PPC_EMULATED_STATS=y # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set @@ -4943,6 +4948,7 @@ CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5092,6 +5098,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index baa4dc2ff..c1adb191c 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2233,6 +2233,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3545,6 +3547,7 @@ CONFIG_PCI_ENDPOINT=y CONFIG_PCIE_PTM=y CONFIG_PCI_HERMES=m CONFIG_PCI_IOV=y +# CONFIG_PCI_MSI_IRQ_DOMAIN is not set CONFIG_PCI_MSI=y CONFIG_PCI_PASID=y CONFIG_PCIPCWATCHDOG=m @@ -3641,8 +3644,10 @@ CONFIG_PPC64=y # CONFIG_PPC_83xx is not set # CONFIG_PPC_86xx is not set # CONFIG_PPC_CELL is not set +CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN=y CONFIG_PPC_DENORMALISATION=y CONFIG_PPC_DISABLE_WERROR=y +CONFIG_PPC_DT_CPU_FTRS=y # CONFIG_PPC_EARLY_DEBUG is not set CONFIG_PPC_EMULATED_STATS=y # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set @@ -4919,6 +4924,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5068,6 +5074,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index b315c8985..c3ddeb886 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -2250,6 +2250,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3566,6 +3568,7 @@ CONFIG_PCI_ENDPOINT=y CONFIG_PCIE_PTM=y CONFIG_PCI_HERMES=m CONFIG_PCI_IOV=y +# CONFIG_PCI_MSI_IRQ_DOMAIN is not set CONFIG_PCI_MSI=y CONFIG_PCI_PASID=y CONFIG_PCIPCWATCHDOG=m @@ -3662,8 +3665,10 @@ CONFIG_PPC64=y # CONFIG_PPC_83xx is not set # CONFIG_PPC_86xx is not set # CONFIG_PPC_CELL is not set +CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN=y CONFIG_PPC_DENORMALISATION=y CONFIG_PPC_DISABLE_WERROR=y +CONFIG_PPC_DT_CPU_FTRS=y # CONFIG_PPC_EARLY_DEBUG is not set CONFIG_PPC_EMULATED_STATS=y # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set @@ -4942,6 +4947,7 @@ CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5091,6 +5097,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 35272d516..12eb430b7 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -2232,6 +2232,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3544,6 +3546,7 @@ CONFIG_PCI_ENDPOINT=y CONFIG_PCIE_PTM=y CONFIG_PCI_HERMES=m CONFIG_PCI_IOV=y +# CONFIG_PCI_MSI_IRQ_DOMAIN is not set CONFIG_PCI_MSI=y CONFIG_PCI_PASID=y CONFIG_PCIPCWATCHDOG=m @@ -3640,8 +3643,10 @@ CONFIG_PPC64=y # CONFIG_PPC_83xx is not set # CONFIG_PPC_86xx is not set # CONFIG_PPC_CELL is not set +CONFIG_PPC_CPUFEATURES_ENABLE_UNKNOWN=y CONFIG_PPC_DENORMALISATION=y CONFIG_PPC_DISABLE_WERROR=y +CONFIG_PPC_DT_CPU_FTRS=y # CONFIG_PPC_EARLY_DEBUG is not set CONFIG_PPC_EMULATED_STATS=y # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set @@ -4918,6 +4923,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5067,6 +5073,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index b49f3a9b7..08d6db2be 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2197,6 +2197,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3492,6 +3494,7 @@ CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCI_HERMES=m CONFIG_PCI_IOV=y +# CONFIG_PCI_MSI_IRQ_DOMAIN is not set CONFIG_PCI_MSI=y CONFIG_PCI_NR_FUNCTIONS=64 CONFIG_PCI_PASID=y @@ -4835,6 +4838,7 @@ CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -4989,6 +4993,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index e58a1f798..cc3416241 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2179,6 +2179,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3470,6 +3472,7 @@ CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCI_HERMES=m CONFIG_PCI_IOV=y +# CONFIG_PCI_MSI_IRQ_DOMAIN is not set CONFIG_PCI_MSI=y CONFIG_PCI_NR_FUNCTIONS=64 CONFIG_PCI_PASID=y @@ -4811,6 +4814,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -4965,6 +4969,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 5a4ae32df..da77faa14 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1161,6 +1161,7 @@ CONFIG_DRM_I2C_SIL164=m # CONFIG_DRM_I915_ALPHA_SUPPORT is not set CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y +# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set CONFIG_DRM_I915_GVT_KVMGT=m CONFIG_DRM_I915_GVT=y CONFIG_DRM_I915=m @@ -2485,6 +2486,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3841,6 +3844,7 @@ CONFIG_PCI_HERMES=m CONFIG_PCI_HYPERV=m CONFIG_PCI_IOV=y CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y CONFIG_PCI_PASID=y CONFIG_PCIPCWATCHDOG=m @@ -5245,6 +5249,7 @@ CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set CONFIG_THERMAL_GOV_BANG_BANG=y CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5405,6 +5410,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 2d35eaedb..484a75216 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1150,6 +1150,7 @@ CONFIG_DRM_I2C_SIL164=m # CONFIG_DRM_I915_ALPHA_SUPPORT is not set CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y +# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set CONFIG_DRM_I915_GVT_KVMGT=m CONFIG_DRM_I915_GVT=y CONFIG_DRM_I915=m @@ -2467,6 +2468,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3821,6 +3824,7 @@ CONFIG_PCI_HERMES=m CONFIG_PCI_HYPERV=m CONFIG_PCI_IOV=y CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y CONFIG_PCI_PASID=y CONFIG_PCIPCWATCHDOG=m @@ -5223,6 +5227,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set CONFIG_THERMAL_GOV_BANG_BANG=y CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -5383,6 +5388,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set diff --git a/kernel.spec b/kernel.spec index 73a27ec88..acec79461 100644 --- a/kernel.spec +++ b/kernel.spec @@ -75,9 +75,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 0 +%global rcrev 1 # The git snapshot level -%define gitrev 9 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -133,7 +133,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 0 +%define debugbuildsenabled 1 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -609,9 +609,6 @@ Patch502: firmware-Drop-WARN-from-usermodehelper_read_trylock-.patch # CVE-2017-7477 rhbz 1445207 1445208 Patch668: CVE-2017-7477.patch -# Fix build on PPC -Patch669: powerpc-fix-distclean-with-Makefile.postlink.patch - Patch679: ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch # END OF PATCH DEFINITIONS @@ -2189,6 +2186,10 @@ fi # # %changelog +* Mon May 15 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc1.git0.1 +- Linux v4.12-rc1 +- Disable debugging options. + * Fri May 12 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc0.git9.1 - Linux v4.11-13318-g09d79d1 diff --git a/powerpc-fix-distclean-with-Makefile.postlink.patch b/powerpc-fix-distclean-with-Makefile.postlink.patch deleted file mode 100644 index f77972964..000000000 --- a/powerpc-fix-distclean-with-Makefile.postlink.patch +++ /dev/null @@ -1,44 +0,0 @@ -From patchwork Mon May 8 08:50:16 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: powerpc: fix distclean with Makefile.postlink -From: =?utf-8?q?Horia_Geant=C4=83?= <horia.geanta@nxp.com> -X-Patchwork-Id: 9715899 -Message-Id: <20170508085016.32601-1-horia.geanta@nxp.com> -To: Benjamin Herrenschmidt <benh@kernel.crashing.org>, - Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au> -Cc: Nicholas Piggin <npiggin@gmail.com>, Mircea Pop <mircea.pop@nxp.com>, - <linuxppc-dev@lists.ozlabs.org>, <linux-kernel@vger.kernel.org> -Date: Mon, 8 May 2017 11:50:16 +0300 - -Makefile.postlink always includes include/config/auto.conf, however -this file is not present in a clean kernel tree, causing make to fail: - -arch/powerpc/Makefile.postlink:10: include/config/auto.conf: No such file or directory -make[1]: *** No rule to make target `include/config/auto.conf'. Stop. -make: *** [vmlinuxclean] Error 2 - -Change the inclusion such that file not being found does not trigger -an error. - -Fixes: f188d0524d7e ("powerpc: Use the new post-link pass to check relocations") -Reported-by: Mircea Pop <mircea.pop@nxp.com> -Signed-off-by: Horia Geantă <horia.geanta@nxp.com> ---- - arch/powerpc/Makefile.postlink | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/powerpc/Makefile.postlink b/arch/powerpc/Makefile.postlink -index 3c22d64b2de9..eccfcc88afae 100644 ---- a/arch/powerpc/Makefile.postlink -+++ b/arch/powerpc/Makefile.postlink -@@ -7,7 +7,7 @@ - PHONY := __archpost - __archpost: - --include include/config/auto.conf -+-include include/config/auto.conf - include scripts/Kbuild.include - - quiet_cmd_relocs_check = CHKREL $@ @@ -1,3 +1,3 @@ SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3 -SHA512 (patch-4.11-git9.xz) = cae51497abd2aa7f5cb1f92b03a469515ceccf14dbd41112f28612b41c04792100fc916c0b2aa5241b83c2c113b133d5a1c39291483abc1be15b82ac1dad7634 +SHA512 (patch-4.12-rc1.xz) = e6144938e8368d2c9dd2a05c68a3f73c2122088a1a09c7c3a63b4f16c4a77b2267f102324f3ecb20101b645b4613cfd24b8907048c76bceb9c2b7a0795e43c84 |