diff options
| -rw-r--r-- | config-arm-generic | 7 | ||||
| -rw-r--r-- | config-arm64 | 32 | ||||
| -rw-r--r-- | config-armv7 | 1 | ||||
| -rw-r--r-- | config-armv7-generic | 3 | ||||
| -rw-r--r-- | config-generic | 9 | ||||
| -rw-r--r-- | config-powerpc64-generic | 8 | ||||
| -rw-r--r-- | config-s390x | 27 | ||||
| -rw-r--r-- | config-x86-generic | 2 | ||||
| -rw-r--r-- | config-x86_64-generic | 4 | ||||
| -rw-r--r-- | kernel.spec | 3 |
10 files changed, 33 insertions, 63 deletions
diff --git a/config-arm-generic b/config-arm-generic index fc3130431..77e1ffe12 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -9,7 +9,6 @@ CONFIG_HW_PERF_EVENTS=y CONFIG_NFS_FS=y CONFIG_FORCE_MAX_ZONEORDER=11 -CONFIG_CRASH=m CONFIG_CC_STACKPROTECTOR=y # CONFIG_PID_IN_CONTEXTIDR is not set @@ -146,6 +145,7 @@ CONFIG_USB_XHCI_PLATFORM=m # MMC/SD CONFIG_MMC_SPI=m +CONFIG_MMC_SDHCI_OF_ARASAN=m # Designware (used by numerous devices) CONFIG_MMC_DW=m @@ -172,6 +172,9 @@ CONFIG_USB_DWC3_ULPI=y CONFIG_DW_WATCHDOG=m CONFIG_PCIE_DW=y # CONFIG_MMC_DW_EXYNOS is not set +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PLATFORM=m +CONFIG_GPIO_DWAPB=m # External Connectors CONFIG_EXTCON=m @@ -309,6 +312,7 @@ CONFIG_COMMON_CLK_SCPI=m # netdrv +CONFIG_NET_VENDOR_MELLANOX=y # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_ADAPTEC is not set # CONFIG_NET_VENDOR_BROADCOM is not set @@ -318,7 +322,6 @@ CONFIG_COMMON_CLK_SCPI=m # CONFIG_NET_VENDOR_DEC is not set # CONFIG_NET_VENDOR_EMULEX is not set # CONFIG_NET_VENDOR_EXAR is not set -# CONFIG_NET_VENDOR_MELLANOX is not set # CONFIG_NET_VENDOR_QLOGIC is not set # CONFIG_NET_VENDOR_SUN is not set # CONFIG_NET_VENDOR_WIZNET is not set diff --git a/config-arm64 b/config-arm64 index bf9c15ff8..e2b9aad11 100644 --- a/config-arm64 +++ b/config-arm64 @@ -10,19 +10,19 @@ CONFIG_SCHED_SMT=y CONFIG_ARCH_HISI=y CONFIG_ARCH_SEATTLE=y CONFIG_ARCH_XGENE=y -# CONFIG_ARCH_THUNDER is not set +# CONFIG_ARCH_BCM_IPROC is not set +# CONFIG_ARCH_BERLIN is not set # CONFIG_ARCH_EXYNOS7 is not set # CONFIG_ARCH_FSL_LS2085A is not set +# CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MEDIATEK is not set -# CONFIG_ARCH_TEGRA is not set # CONFIG_ARCH_QCOM is not set -# CONFIG_ARCH_SPRD is not set -# CONFIG_ARCH_ZYNQMP is not set -# CONFIG_ARCH_BCM_IPROC is not set -# CONFIG_ARCH_BERLIN is not set # CONFIG_ARCH_ROCKCHIP is not set -# CONFIG_ARCH_LAYERSCAPE is not set +# CONFIG_ARCH_SPRD is not set # CONFIG_ARCH_STRATIX10 is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_THUNDER is not set +# CONFIG_ARCH_ZYNQMP is not set # Erratum CONFIG_ARM64_ERRATUM_826319=y @@ -64,7 +64,7 @@ CONFIG_HVC_DRIVER=y CONFIG_HZ=100 CONFIG_KVM=y -CONFIG_KVM_ARM_MAX_VCPUS=8 +CONFIG_KVM_ARM_MAX_VCPUS=16 CONFIG_RCU_FANOUT=64 CONFIG_SPARSE_IRQ=y @@ -96,6 +96,8 @@ CONFIG_PCC=y CONFIG_ACPI_CPPC_CPUFREQ=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_THERMAL=y +CONFIG_I2C_SCMI=m +CONFIG_SENSORS_ACPI_POWER=m CONFIG_ARM64_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM64_CE=y @@ -113,7 +115,6 @@ CONFIG_CRYPTO_DEV_CCP_CRYPTO=m # APM Xgene CONFIG_POWER_RESET_XGENE=y CONFIG_COMMON_CLK_XGENE=y - CONFIG_AHCI_XGENE=y CONFIG_PHY_XGENE=y CONFIG_NET_XGENE=y @@ -123,6 +124,9 @@ CONFIG_GPIO_XGENE=y CONFIG_GPIO_XGENE_SB=m CONFIG_XGENE_DMA=m CONFIG_EDAC_XGENE=m +CONFIG_PCI_XGENE=y +CONFIG_PCI_XGENE_MSI=y +CONFIG_I2C_XGENE_SLIMPRO=m # busted build for various reasons # uses pci_* for some reason to allocate DMA buffers @@ -133,16 +137,11 @@ CONFIG_EDAC_XGENE=m # CONFIG_PARPORT_PC is not set # CONFIG_VGA_CONSOLE is not set -CONFIG_PCI_XGENE=y -CONFIG_PCI_XGENE_MSI=y # CONFIG_HOTPLUG_PCI_SHPC is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set # CONFIG_PNP_DEBUG_MESSAGES is not set -CONFIG_I2C_SCMI=m -CONFIG_I2C_XGENE_SLIMPRO=m -CONFIG_SENSORS_ACPI_POWER=m # AMD Seattle CONFIG_NET_SB1000=y @@ -160,11 +159,6 @@ CONFIG_PCI_HISI=y # ThunderX # CONFIG_MDIO_OCTEON is not set -CONFIG_NET_VENDOR_MELLANOX=y -CONFIG_MLX4_EN=m -CONFIG_MLX4_EN_DCB=y -CONFIG_MLX4_EN_VXLAN=y - # CONFIG_IMX_THERMAL is not set CONFIG_DMI=y diff --git a/config-armv7 b/config-armv7 index 294a0a556..eaa6d4ebf 100644 --- a/config-armv7 +++ b/config-armv7 @@ -604,7 +604,6 @@ CONFIG_GPIO_ZYNQ=m CONFIG_I2C_XILINX=m CONFIG_SPI_XILINX=m CONFIG_SPI_CADENCE=m -CONFIG_MMC_SDHCI_OF_ARASAN=m CONFIG_I2C_CADENCE=m CONFIG_XILINX_WATCHDOG=m CONFIG_XILINX_XADC=m diff --git a/config-armv7-generic b/config-armv7-generic index 28983f709..8c35e4896 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -628,8 +628,6 @@ CONFIG_SPI_XCOMM=m CONFIG_NFC_NCI_SPI=y # i2c -CONFIG_I2C_DESIGNWARE_CORE=m -CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_I2C_MV64XXX=m # HW crypto and rng @@ -909,7 +907,6 @@ CONFIG_R8188EU=m # CONFIG_SCSI_ACARD is not set # CONFIG_SFC is not set # CONFIG_SND_ALI5451 is not set -# CONFIG_MLX4_EN is not set # CONFIG_POWER_RESET_QNAP is not set # CONFIG_MMC_TMIO is not set # CONFIG_PINCTRL_IMX35 is not set diff --git a/config-generic b/config-generic index a784dffbb..6c999c510 100644 --- a/config-generic +++ b/config-generic @@ -189,8 +189,6 @@ CONFIG_INFINIBAND_CXGB4=m CONFIG_SCSI_CXGB3_ISCSI=m CONFIG_SCSI_CXGB4_ISCSI=m # CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_MLX5_INFINIBAND=m CONFIG_INFINIBAND_NES=m # CONFIG_INFINIBAND_NES_DEBUG is not set CONFIG_INFINIBAND_QIB=m @@ -1689,9 +1687,12 @@ CONFIG_MLX4_CORE=m CONFIG_MLX4_EN=m CONFIG_MLX4_EN_DCB=y CONFIG_MLX4_EN_VXLAN=y +CONFIG_MLX4_INFINIBAND=m CONFIG_MLX5_CORE=m CONFIG_MLX5_CORE_EN=y +CONFIG_MLX5_INFINIBAND=m # CONFIG_MLXSW_CORE is not set +# CONFIG_MLX4_DEBUG is not set # CONFIG_SFC is not set # CONFIG_FDDI is not set @@ -4763,8 +4764,8 @@ CONFIG_LATENCYTOP=y # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set CONFIG_EARLY_PRINTK_DBGP=y # CONFIG_PAGE_POISONING is not set -# CONFIG_CRASH_DUMP is not set -# CONFIG_CRASH is not set +CONFIG_CRASH=m +CONFIG_CRASH_DUMP=y # CONFIG_GCOV_KERNEL is not set CONFIG_KGDB=y diff --git a/config-powerpc64-generic b/config-powerpc64-generic index 13d546190..b543cfbb6 100644 --- a/config-powerpc64-generic +++ b/config-powerpc64-generic @@ -64,8 +64,6 @@ CONFIG_CGROUP_HUGETLB=y CONFIG_RCU_FANOUT=64 CONFIG_RCU_FANOUT_LEAF=16 -CONFIG_CRASH=m -CONFIG_CRASH_DUMP=y CONFIG_FA_DUMP=y CONFIG_RELOCATABLE=y @@ -261,10 +259,6 @@ CONFIG_SND_PPC=y CONFIG_NET_VENDOR_IBM=y -CONFIG_MLX4_EN=m -CONFIG_MLX4_EN_DCB=y -CONFIG_MLX4_EN_VXLAN=y - # CONFIG_SERIO_XILINX_XPS_PS2 is not set # CONFIG_PPC_SMLPAR is not set @@ -317,8 +311,6 @@ CONFIG_PPC_EMULATED_STATS=y CONFIG_SWIOTLB=y -# CONFIG_RDS is not set - CONFIG_PPC_DISABLE_WERROR=y # CONFIG_STRICT_MM_TYPECHECKS is not set diff --git a/config-s390x b/config-s390x index ae94aa82d..a41d95ac4 100644 --- a/config-s390x +++ b/config-s390x @@ -14,6 +14,8 @@ CONFIG_HZ_100=y CONFIG_LOG_BUF_SHIFT=16 +CONFIG_IRQ_DOMAIN_DEBUG=y + # # I/O subsystem configuration # @@ -127,10 +129,12 @@ CONFIG_MSDOS_PARTITION=y # # S390 crypto hw # +CONFIG_CRYPTO_AES_S390=m +CONFIG_CRYPTO_DES_S390=m +CONFIG_CRYPTO_GHASH_S390=m CONFIG_CRYPTO_SHA1_S390=m CONFIG_CRYPTO_SHA256_S390=m -CONFIG_CRYPTO_DES_S390=m -CONFIG_CRYPTO_AES_S390=m +CONFIG_CRYPTO_SHA512_S390=m # # Kernel hacking @@ -170,7 +174,7 @@ CONFIG_S390_VMUR=m CONFIG_CTCM=m CONFIG_QETH_L2=m CONFIG_QETH_L3=m -CONFIG_CRYPTO_SHA512_S390=m + CONFIG_KVM=m # CONFIG_KVM_S390_UCONTROL is not set CONFIG_S390_GUEST=y @@ -205,8 +209,6 @@ CONFIG_SCHED_TOPOLOGY=y # CONFIG_WARN_DYNAMIC_STACK is not set -CONFIG_CRYPTO_GHASH_S390=m - # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_SCM_BUS=y CONFIG_EADM_SCH=m @@ -292,20 +294,5 @@ CONFIG_HOTPLUG_PCI_S390=y # CONFIG_NET_VENDOR_VIA is not set # CONFIG_IEEE802154_DRIVERS is not set # CONFIG_MDIO_OCTEON is not set - # CONFIG_FMC is not set - # CONFIG_OF is not set - -CONFIG_MLX4_EN=m -CONFIG_MLX4_EN_DCB=y -CONFIG_MLX4_EN_VXLAN=y -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_MLX4_INFINIBAND=m -CONFIG_RDS=m -CONFIG_RDS_RDMA=m -CONFIG_RDS_TCP=m -CONFIG_IRQ_DOMAIN_DEBUG=y - -CONFIG_CRASH=m diff --git a/config-x86-generic b/config-x86-generic index 2840aac94..83254f3bc 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -266,9 +266,7 @@ CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_VIA_WDT=m CONFIG_IE6XX_WDT=m -CONFIG_CRASH_DUMP=y CONFIG_PROC_VMCORE=y -CONFIG_CRASH=m CONFIG_KVM=m CONFIG_KVM_INTEL=m diff --git a/config-x86_64-generic b/config-x86_64-generic index e845c89f4..9d13391fc 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -184,10 +184,6 @@ CONFIG_NTB_TRANSPORT=m # 10GigE # CONFIG_IP1000=m -CONFIG_MLX4_EN=m -CONFIG_MLX4_EN_DCB=y -CONFIG_MLX4_EN_VXLAN=y -# CONFIG_MLX4_DEBUG is not set CONFIG_SFC=m CONFIG_SFC_MCDI_MON=y CONFIG_SFC_SRIOV=y diff --git a/kernel.spec b/kernel.spec index 4e662efe3..f2ce43e55 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2062,6 +2062,9 @@ fi # # %changelog +* Sun Dec 27 2015 Peter Robinson <pbrobinson@fedoraproject.org> +- Minor ARMv7/aarch64/ppc/s390 config cleanups + * Wed Dec 23 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc6.git1.1 - Linux v4.4-rc6-23-g24bc3ea - Reenable debugging options. |