diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-13 10:28:43 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-13 10:28:43 +0200 |
| commit | d6fd520355f1d3a9fd806285190654fb4aed84b6 (patch) | |
| tree | 668602ceb0ea8de9f088198fcce2da0bcd9c45b0 | |
| parent | 0695f06e29170d1ad1c8369303526dedb4e1ac4b (diff) | |
| parent | bf590656f4bcf3aabc56f78ed7de8dbc55988156 (diff) | |
| download | kernel-d6fd520355f1d3a9fd806285190654fb4aed84b6.tar.gz kernel-d6fd520355f1d3a9fd806285190654fb4aed84b6.tar.xz kernel-d6fd520355f1d3a9fd806285190654fb4aed84b6.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc24
50 files changed, 149 insertions, 157 deletions
diff --git a/ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch b/ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch new file mode 100644 index 000000000..af2a3dfc2 --- /dev/null +++ b/ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch @@ -0,0 +1,65 @@ +From patchwork Fri May 12 10:04:52 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: ARM: KVM: Fix tracepoint generation after move to virt/kvm/arm/ +From: Marc Zyngier <Marc.Zyngier@arm.com> +X-Patchwork-Id: 9723825 +Message-Id: <20170512100452.8245-1-marc.zyngier@arm.com> +To: Christoffer Dall <christoffer.dall@linaro.org> +Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, + linux-arm-kernel@lists.infradead.org, arnd@arndb.de +Date: Fri, 12 May 2017 11:04:52 +0100 + +Moving most of the shared code to virt/kvm/arm had for consequence +that KVM/ARM doesn't build anymore, because the code that used to +define the tracepoints is now somewhere else. + +Fix this by defining CREATE_TRACE_POINTS in coproc.c, and clean-up +trace.h as well. + +Fixes: 35d2d5d490e2 ("KVM: arm/arm64: Move shared files to virt/kvm/arm") +Reported-by: Arnd Bergmann <arnd@arndb.de> +Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> +--- + arch/arm/kvm/coproc.c | 1 + + arch/arm/kvm/trace.h | 8 ++++---- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c +index 2c14b69511e9..ac8d36da4d08 100644 +--- a/arch/arm/kvm/coproc.c ++++ b/arch/arm/kvm/coproc.c +@@ -32,6 +32,7 @@ + #include <asm/vfp.h> + #include "../vfp/vfpinstr.h" + ++#define CREATE_TRACE_POINTS + #include "trace.h" + #include "coproc.h" + +diff --git a/arch/arm/kvm/trace.h b/arch/arm/kvm/trace.h +index fc0943776db2..b0d10648c486 100644 +--- a/arch/arm/kvm/trace.h ++++ b/arch/arm/kvm/trace.h +@@ -1,5 +1,5 @@ +-#if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ) +-#define _TRACE_KVM_H ++#if !defined(_TRACE_ARM_KVM_H) || defined(TRACE_HEADER_MULTI_READ) ++#define _TRACE_ARM_KVM_H + + #include <linux/tracepoint.h> + +@@ -74,10 +74,10 @@ TRACE_EVENT(kvm_hvc, + __entry->vcpu_pc, __entry->r0, __entry->imm) + ); + +-#endif /* _TRACE_KVM_H */ ++#endif /* _TRACE_ARM_KVM_H */ + + #undef TRACE_INCLUDE_PATH +-#define TRACE_INCLUDE_PATH arch/arm/kvm ++#define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE + #define TRACE_INCLUDE_FILE trace + diff --git a/baseconfig/CONFIG_BCM_FLEXRM_MBOX b/baseconfig/CONFIG_BCM_FLEXRM_MBOX index bce47ff5e..b47d4f392 100644 --- a/baseconfig/CONFIG_BCM_FLEXRM_MBOX +++ b/baseconfig/CONFIG_BCM_FLEXRM_MBOX @@ -1 +1 @@ -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set diff --git a/baseconfig/CONFIG_BLK_DEV_HD b/baseconfig/CONFIG_BLK_DEV_HD deleted file mode 100644 index 9155aa284..000000000 --- a/baseconfig/CONFIG_BLK_DEV_HD +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_BLK_DEV_HD is not set diff --git a/baseconfig/CONFIG_CEC_PLATFORM_DRIVERS b/baseconfig/CONFIG_CEC_PLATFORM_DRIVERS index dfcce2d3f..07bd8e955 100644 --- a/baseconfig/CONFIG_CEC_PLATFORM_DRIVERS +++ b/baseconfig/CONFIG_CEC_PLATFORM_DRIVERS @@ -1 +1 @@ -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y diff --git a/baseconfig/CONFIG_MMC_CAVIUM_THUNDERX b/baseconfig/CONFIG_MMC_CAVIUM_THUNDERX deleted file mode 100644 index 1c1de4f0d..000000000 --- a/baseconfig/CONFIG_MMC_CAVIUM_THUNDERX +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MMC_CAVIUM_THUNDERX is not set diff --git a/baseconfig/CONFIG_NET_XGENE_V2 b/baseconfig/CONFIG_NET_XGENE_V2 deleted file mode 100644 index e7ebb61ad..000000000 --- a/baseconfig/CONFIG_NET_XGENE_V2 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_NET_XGENE_V2 is not set diff --git a/baseconfig/CONFIG_RPMSG_QCOM_SMD b/baseconfig/CONFIG_RPMSG_QCOM_SMD deleted file mode 100644 index b4cec4c9c..000000000 --- a/baseconfig/CONFIG_RPMSG_QCOM_SMD +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_RPMSG_QCOM_SMD is not set diff --git a/baseconfig/CONFIG_USB_PCI b/baseconfig/CONFIG_USB_PCI index 4ffaf0ae0..26c372a3a 100644 --- a/baseconfig/CONFIG_USB_PCI +++ b/baseconfig/CONFIG_USB_PCI @@ -1 +1 @@ -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y diff --git a/baseconfig/arm/CONFIG_USB_PCI b/baseconfig/arm/CONFIG_USB_PCI deleted file mode 100644 index 26c372a3a..000000000 --- a/baseconfig/arm/CONFIG_USB_PCI +++ /dev/null @@ -1 +0,0 @@ -CONFIG_USB_PCI=y diff --git a/baseconfig/arm/CONFIG_PHY_QCOM_QMP b/baseconfig/arm/arm64/CONFIG_PHY_QCOM_QMP index cba57faf8..cba57faf8 100644 --- a/baseconfig/arm/CONFIG_PHY_QCOM_QMP +++ b/baseconfig/arm/arm64/CONFIG_PHY_QCOM_QMP diff --git a/baseconfig/arm/CONFIG_PHY_QCOM_QUSB2 b/baseconfig/arm/arm64/CONFIG_PHY_QCOM_QUSB2 index 6512e59d2..6512e59d2 100644 --- a/baseconfig/arm/CONFIG_PHY_QCOM_QUSB2 +++ b/baseconfig/arm/arm64/CONFIG_PHY_QCOM_QUSB2 diff --git a/baseconfig/arm/arm64/CONFIG_QCOM_SMD b/baseconfig/arm/arm64/CONFIG_QCOM_SMD deleted file mode 100644 index d43fecfdb..000000000 --- a/baseconfig/arm/arm64/CONFIG_QCOM_SMD +++ /dev/null @@ -1 +0,0 @@ -CONFIG_QCOM_SMD=m diff --git a/baseconfig/arm/CONFIG_RPMSG_QCOM_SMD b/baseconfig/arm/arm64/CONFIG_RPMSG_QCOM_SMD index f65af3d10..f65af3d10 100644 --- a/baseconfig/arm/CONFIG_RPMSG_QCOM_SMD +++ b/baseconfig/arm/arm64/CONFIG_RPMSG_QCOM_SMD diff --git a/baseconfig/arm/CONFIG_SUN4I_GPADC b/baseconfig/arm/arm64/CONFIG_SUN4I_GPADC index 97139c216..97139c216 100644 --- a/baseconfig/arm/CONFIG_SUN4I_GPADC +++ b/baseconfig/arm/arm64/CONFIG_SUN4I_GPADC diff --git a/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX b/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX new file mode 100644 index 000000000..b401f79fb --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX @@ -0,0 +1 @@ +# CONFIG_PCI_DRA7XX is not set diff --git a/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_EP b/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_EP new file mode 100644 index 000000000..8a6a68062 --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_EP @@ -0,0 +1 @@ +# CONFIG_PCI_DRA7XX_EP is not set diff --git a/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_HOST b/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_HOST new file mode 100644 index 000000000..7bbb2fd97 --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_PCI_DRA7XX_HOST @@ -0,0 +1 @@ +# CONFIG_PCI_DRA7XX_HOST is not set diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SOC_DRA7XX b/baseconfig/arm/armv7/CONFIG_SOC_DRA7XX index a11bb6971..a11bb6971 100644 --- a/baseconfig/arm/armv7/armv7/CONFIG_SOC_DRA7XX +++ b/baseconfig/arm/armv7/CONFIG_SOC_DRA7XX diff --git a/baseconfig/arm/armv7/CONFIG_SUN4I_GPADC b/baseconfig/arm/armv7/CONFIG_SUN4I_GPADC new file mode 100644 index 000000000..97139c216 --- /dev/null +++ b/baseconfig/arm/armv7/CONFIG_SUN4I_GPADC @@ -0,0 +1 @@ +CONFIG_SUN4I_GPADC=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX b/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX deleted file mode 100644 index 7f8a147e3..000000000 --- a/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PCI_DRA7XX=y diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX_EP b/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX_EP deleted file mode 100644 index 1aa92a161..000000000 --- a/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX_EP +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PCI_DRA7XX_EP=y diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX_HOST b/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX_HOST deleted file mode 100644 index ad85e3fe7..000000000 --- a/baseconfig/arm/armv7/armv7/CONFIG_PCI_DRA7XX_HOST +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PCI_DRA7XX_HOST=y diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QMP b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QMP new file mode 100644 index 000000000..cba57faf8 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QMP @@ -0,0 +1 @@ +CONFIG_PHY_QCOM_QMP=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QUSB2 b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QUSB2 new file mode 100644 index 000000000..6512e59d2 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_PHY_QCOM_QUSB2 @@ -0,0 +1 @@ +CONFIG_PHY_QCOM_QUSB2=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMD b/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMD deleted file mode 100644 index d43fecfdb..000000000 --- a/baseconfig/arm/armv7/armv7/CONFIG_QCOM_SMD +++ /dev/null @@ -1 +0,0 @@ -CONFIG_QCOM_SMD=m diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_SMD b/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_SMD new file mode 100644 index 000000000..f65af3d10 --- /dev/null +++ b/baseconfig/arm/armv7/armv7/CONFIG_RPMSG_QCOM_SMD @@ -0,0 +1 @@ +CONFIG_RPMSG_QCOM_SMD=m diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SOC_DRA7XX b/baseconfig/arm/armv7/lpae/CONFIG_SOC_DRA7XX deleted file mode 100644 index a11bb6971..000000000 --- a/baseconfig/arm/armv7/lpae/CONFIG_SOC_DRA7XX +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SOC_DRA7XX is not set @@ -1 +1 @@ -791a9a666d1afe2603bcb2c6a4852d684e879252 +09d79d103371b1b7ea70ea7f9c05ac207ef22f5d diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 4ef10cb6a..2dcba8ef7 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -488,7 +488,7 @@ CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m CONFIG_BCMA_POSSIBLE=y -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_PDC_MBOX is not set @@ -521,7 +521,6 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -755,7 +754,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -4137,7 +4136,6 @@ CONFIG_QCOM_L3_PMU=y # CONFIG_QCOM_Q6V5_PIL is not set CONFIG_QCOM_QDF2400_ERRATUM_0065=y CONFIG_QCOM_QFPROM=m -CONFIG_QCOM_SMD=m CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_SMEM=m CONFIG_QCOM_SMP2P=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 3a1416fdb..803a2b2cb 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -488,7 +488,7 @@ CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m CONFIG_BCMA_POSSIBLE=y -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_PDC_MBOX is not set @@ -521,7 +521,6 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -755,7 +754,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -4115,7 +4114,6 @@ CONFIG_QCOM_L3_PMU=y # CONFIG_QCOM_Q6V5_PIL is not set CONFIG_QCOM_QDF2400_ERRATUM_0065=y CONFIG_QCOM_QFPROM=m -CONFIG_QCOM_SMD=m CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_SMEM=m CONFIG_QCOM_SMP2P=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 13f54c6ec..43af1bf20 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -532,7 +532,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -564,7 +564,6 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -800,7 +799,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -3253,7 +3252,6 @@ CONFIG_MMC_BCM2835=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC_DW_EXYNOS=m @@ -3783,7 +3781,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -4185,9 +4182,9 @@ CONFIG_PCF50633_GPIO=m # CONFIG_PCH_GBE is not set CONFIG_PCI_AARDVARK=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_DRA7XX_EP=y -CONFIG_PCI_DRA7XX_HOST=y -CONFIG_PCI_DRA7XX=y +# CONFIG_PCI_DRA7XX_EP is not set +# CONFIG_PCI_DRA7XX_HOST is not set +# CONFIG_PCI_DRA7XX is not set CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIE_ALTERA is not set @@ -4469,7 +4466,6 @@ CONFIG_QCOM_PM8XXX_XOADC=m CONFIG_QCOM_PM=y # CONFIG_QCOM_Q6V5_PIL is not set CONFIG_QCOM_QFPROM=m -CONFIG_QCOM_SMD=m CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_SMEM=m CONFIG_QCOM_SMP2P=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index aa71caa00..eaa3f9407 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -510,7 +510,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -542,7 +542,6 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -778,7 +777,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -3115,7 +3114,6 @@ CONFIG_MMC_BCM2835=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC_DW_EXYNOS=m @@ -3618,7 +3616,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -3980,6 +3977,9 @@ CONFIG_PCF50633_GPIO=m # CONFIG_PCH_GBE is not set CONFIG_PCI_AARDVARK=y # CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_DRA7XX_EP is not set +# CONFIG_PCI_DRA7XX_HOST is not set +# CONFIG_PCI_DRA7XX is not set CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIE_ALTERA is not set @@ -4052,8 +4052,6 @@ CONFIG_PHY_MVEBU_SATA=y # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_IPQ806X_SATA is not set -CONFIG_PHY_QCOM_QMP=m -CONFIG_PHY_QCOM_QUSB2=m CONFIG_PHY_QCOM_USB_HSIC=m CONFIG_PHY_QCOM_USB_HS=m CONFIG_PHY_ROCKCHIP_DP=m @@ -4426,7 +4424,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -CONFIG_RPMSG_QCOM_SMD=m CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 0b2412cdb..0ec38af52 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -509,7 +509,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -541,7 +541,6 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -777,7 +776,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -3095,7 +3094,6 @@ CONFIG_MMC_BCM2835=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC_DW_EXYNOS=m @@ -3597,7 +3595,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -3959,6 +3956,9 @@ CONFIG_PCF50633_GPIO=m # CONFIG_PCH_GBE is not set CONFIG_PCI_AARDVARK=y # CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_DRA7XX_EP is not set +# CONFIG_PCI_DRA7XX_HOST is not set +# CONFIG_PCI_DRA7XX is not set CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIE_ALTERA is not set @@ -4031,8 +4031,6 @@ CONFIG_PHY_MVEBU_SATA=y # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_IPQ806X_SATA is not set -CONFIG_PHY_QCOM_QMP=m -CONFIG_PHY_QCOM_QUSB2=m CONFIG_PHY_QCOM_USB_HSIC=m CONFIG_PHY_QCOM_USB_HS=m CONFIG_PHY_ROCKCHIP_DP=m @@ -4404,7 +4402,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -CONFIG_RPMSG_QCOM_SMD=m CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 38fced71d..fc5691c15 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -531,7 +531,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -563,7 +563,6 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -799,7 +798,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -3233,7 +3232,6 @@ CONFIG_MMC_BCM2835=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC_DW_EXYNOS=m @@ -3762,7 +3760,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -4164,9 +4161,9 @@ CONFIG_PCF50633_GPIO=m # CONFIG_PCH_GBE is not set CONFIG_PCI_AARDVARK=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_DRA7XX_EP=y -CONFIG_PCI_DRA7XX_HOST=y -CONFIG_PCI_DRA7XX=y +# CONFIG_PCI_DRA7XX_EP is not set +# CONFIG_PCI_DRA7XX_HOST is not set +# CONFIG_PCI_DRA7XX is not set CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIE_ALTERA is not set @@ -4447,7 +4444,6 @@ CONFIG_QCOM_PM8XXX_XOADC=m CONFIG_QCOM_PM=y # CONFIG_QCOM_Q6V5_PIL is not set CONFIG_QCOM_QFPROM=m -CONFIG_QCOM_SMD=m CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_SMEM=m CONFIG_QCOM_SMP2P=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index c09f3b023..9a7e6be61 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -409,7 +409,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -441,7 +441,6 @@ CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -665,7 +664,7 @@ CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -2958,7 +2957,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC=m @@ -3416,7 +3414,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -4102,7 +4099,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5560,7 +5556,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 916d9c792..ec5cc3ea5 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -410,7 +410,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -442,7 +442,6 @@ CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -666,7 +665,7 @@ CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -2978,7 +2977,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC=m @@ -3436,7 +3434,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -4123,7 +4120,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5582,7 +5578,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 14f354b45..b43dd1282 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -410,7 +410,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -442,7 +442,6 @@ CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -666,7 +665,7 @@ CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -2978,7 +2977,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC=m @@ -3436,7 +3434,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -4123,7 +4120,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5582,7 +5578,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-i686.config b/kernel-i686.config index 1730e3ab8..0793af75e 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -409,7 +409,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -441,7 +441,6 @@ CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -665,7 +664,7 @@ CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -2958,7 +2957,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC=m @@ -3416,7 +3414,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -4102,7 +4099,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5560,7 +5556,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 0b760328e..d38c12230 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -357,7 +357,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -397,7 +397,6 @@ CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m CONFIG_BLK_DEV_GENERIC=y -# CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_HPT366 is not set CONFIG_BLK_DEV_IDECD=m # CONFIG_BLK_DEV_IDECS is not set @@ -652,7 +651,7 @@ CONFIG_CB710_CORE=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -2823,7 +2822,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC=m @@ -3269,7 +3267,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -3946,7 +3943,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5377,7 +5373,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-ppc64.config b/kernel-ppc64.config index bba8e9c1f..39db650ab 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -356,7 +356,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -396,7 +396,6 @@ CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m CONFIG_BLK_DEV_GENERIC=y -# CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_HPT366 is not set CONFIG_BLK_DEV_IDECD=m # CONFIG_BLK_DEV_IDECS is not set @@ -651,7 +650,7 @@ CONFIG_CB710_CORE=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -2802,7 +2801,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC=m @@ -3247,7 +3245,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -3923,7 +3920,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5353,7 +5349,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index c777e582e..a903e2327 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -351,7 +351,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -382,7 +382,6 @@ CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -609,7 +608,7 @@ CONFIG_CB710_CORE=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -2769,7 +2768,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC=m @@ -3214,7 +3212,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -3886,7 +3883,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5306,7 +5302,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 7725491cb..baa4dc2ff 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -350,7 +350,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -381,7 +381,6 @@ CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -608,7 +607,7 @@ CONFIG_CB710_CORE=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -2748,7 +2747,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC=m @@ -3192,7 +3190,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -3863,7 +3860,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5282,7 +5278,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index c40442734..b315c8985 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -351,7 +351,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -382,7 +382,6 @@ CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -609,7 +608,7 @@ CONFIG_CB710_CORE=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -2768,7 +2767,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC=m @@ -3213,7 +3211,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -3885,7 +3882,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5305,7 +5301,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 408206bac..35272d516 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -350,7 +350,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -381,7 +381,6 @@ CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -608,7 +607,7 @@ CONFIG_CB710_CORE=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -2747,7 +2746,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC=m @@ -3191,7 +3189,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -3862,7 +3859,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5281,7 +5277,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 26f8d7182..b49f3a9b7 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -352,7 +352,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set # CONFIG_BCMA is not set -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -383,7 +383,6 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -608,7 +607,7 @@ CONFIG_CCW=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -2704,7 +2703,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC is not set @@ -3141,7 +3139,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y # CONFIG_NEW_LEDS is not set CONFIG_NFC_DIGITAL=m @@ -3777,7 +3774,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5196,7 +5192,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-s390x.config b/kernel-s390x.config index 0f77a1f3a..e58a1f798 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -351,7 +351,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set # CONFIG_BCMA is not set -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -382,7 +382,6 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -607,7 +606,7 @@ CONFIG_CCW=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -2683,7 +2682,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set # CONFIG_MMC is not set @@ -3119,7 +3117,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y # CONFIG_NEW_LEDS is not set CONFIG_NFC_DIGITAL=m @@ -3754,7 +3751,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5172,7 +5168,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index e7ceb596f..5a4ae32df 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -407,7 +407,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -443,7 +443,6 @@ CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -670,7 +669,7 @@ CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -3010,7 +3009,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC=m @@ -3459,7 +3457,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -4145,7 +4142,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5613,7 +5609,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 4a52f9f7d..2d35eaedb 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -406,7 +406,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -CONFIG_BCM_FLEXRM_MBOX=m +# CONFIG_BCM_FLEXRM_MBOX is not set CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_VIDEOCORE is not set @@ -442,7 +442,6 @@ CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m -# CONFIG_BLK_DEV_HD is not set CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_IO_TRACE=y @@ -669,7 +668,7 @@ CONFIG_CC_STACKPROTECTOR=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -# CONFIG_CEC_PLATFORM_DRIVERS is not set +CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y @@ -2990,7 +2989,6 @@ CONFIG_MMA7660=m CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 -# CONFIG_MMC_CAVIUM_THUNDERX is not set CONFIG_MMC_CB710=m # CONFIG_MMC_DEBUG is not set CONFIG_MMC=m @@ -3439,7 +3437,6 @@ CONFIG_NET_VRF=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_NETXEN_NIC=m -# CONFIG_NET_XGENE_V2 is not set CONFIG_NET=y CONFIG_NEW_LEDS=y CONFIG_NFC_DIGITAL=m @@ -4124,7 +4121,6 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set -# CONFIG_RPMSG_QCOM_SMD is not set CONFIG_RPR0521=m CONFIG_RSI_91X=m CONFIG_RSI_DEBUGFS=y @@ -5591,7 +5587,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_PCI is not set +CONFIG_USB_PCI=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_PEGASUS=m CONFIG_USB_PHY=y diff --git a/kernel.spec b/kernel.spec index 2048f0d75..73a27ec88 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 8 +%define gitrev 9 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -612,6 +612,8 @@ 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 %endif @@ -2187,6 +2189,9 @@ fi # # %changelog +* Fri May 12 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc0.git9.1 +- Linux v4.11-13318-g09d79d1 + * Thu May 11 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc0.git8.1 - Linux v4.11-13167-g791a9a6 @@ -1,3 +1,3 @@ SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3 -SHA512 (patch-4.11-git8.xz) = fd1a247a29f73ebd408cef1c41f923ac5a92062e9dae3e8fdffb964cd96936fac823273455a7c2669ffec0edecd4df6ebb9f379f693dfe8867b900b2c6a187f4 +SHA512 (patch-4.11-git9.xz) = cae51497abd2aa7f5cb1f92b03a469515ceccf14dbd41112f28612b41c04792100fc916c0b2aa5241b83c2c113b133d5a1c39291483abc1be15b82ac1dad7634 |