Linux v4.1-11355-g6aaf0da8728c

- Add patch to fix KVM sleeping in atomic issue (rhbz 1237143)
- Fix errant with_perf disable that removed perf entirely (rhbz 1237266)

1 files changed, 33 insertions, 40 deletions

diff --git a/config-arm64 b/config-arm64
index 557b95eaf..3e6e1e545 100644
--- a/config-arm64
+++ b/config-arm64
@@ -7,12 +7,12 @@ CONFIG_SCHED_SMT=y
 # CONFIG_CPU_BIG_ENDIAN is not set
 
 # arm64 only SoCs
-CONFIG_ARCH_XGENE=y
+CONFIG_ARCH_HISI=y
 CONFIG_ARCH_SEATTLE=y
+CONFIG_ARCH_XGENE=y
 # CONFIG_ARCH_THUNDER is not set
 # CONFIG_ARCH_EXYNOS7 is not set
 # CONFIG_ARCH_FSL_LS2085A is not set
-# CONFIG_ARCH_HISI is not set
 # CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_QCOM is not set
@@ -26,7 +26,14 @@ CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_832075=y
 
+# AMBA / VExpress
+# CONFIG_PL330_DMA is not set
+# CONFIG_RTC_DRV_PL030 is not set
+CONFIG_RTC_DRV_PL031=y
+# CONFIG_SERIAL_AMBA_PL010 is not set
 # CONFIG_AMBA_PL08X is not set
+CONFIG_ARM_SMMU_V3=y
+
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_ARM64_64K_PAGES=y
@@ -41,35 +48,14 @@ CONFIG_CMDLINE="console=ttyAMA0"
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CONSOLE_TRANSLATIONS=y
 
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_CSUM=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_IO=y
-CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_HAVE_NET_DSA=y
-# CONFIG_HUGETLB_PAGE is not set
 CONFIG_HVC_DRIVER=y
 CONFIG_HZ=100
 
 CONFIG_KVM=y
 CONFIG_KVM_ARM_MAX_VCPUS=8
 
-CONFIG_NFS_ACL_SUPPORT=y
-CONFIG_NFS_COMMON=y
-CONFIG_NFS_DEBUG=y
-# CONFIG_NFSD_FAULT_INJECTION is not set
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFS_USE_KERNEL_DNS=y
-# CONFIG_PL330_DMA is not set
 CONFIG_RCU_FANOUT=64
-# CONFIG_RTC_DRV_PL030 is not set
-CONFIG_RTC_DRV_PL031=y
-CONFIG_SERIAL_8250_DMA=y
-# CONFIG_SERIAL_AMBA_PL010 is not set
 CONFIG_SPARSE_IRQ=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 
@@ -83,6 +69,20 @@ CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 CONFIG_RTC_DRV_EFI=y
 
+CONFIG_ACPI=y
+CONFIG_ACPI_PROCFS_POWER=y
+CONFIG_ACPI_EC_DEBUGFS=y
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_IPMI=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HED=m
+CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_NFIT=m
+# CONFIG_ACPI_NFIT_DEBUG is not set
+CONFIG_PCC=y
+
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM64_CE=m
 CONFIG_CRYPTO_SHA2_ARM64_CE=m
@@ -121,8 +121,6 @@ CONFIG_EDAC_XGENE=m
 
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_XGENE_MSI=y
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_CPCI is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 
 # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
@@ -132,23 +130,16 @@ CONFIG_I2C_SCMI=m
 CONFIG_I2C_XGENE_SLIMPRO=m
 CONFIG_SENSORS_ACPI_POWER=m
 
-CONFIG_ACPI=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_EC_DEBUGFS=y
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_IPMI=y
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HED=m
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_PCC=y
-
+# AMD Seattle
 CONFIG_NET_SB1000=y
 CONFIG_AMD_XGBE=m
 CONFIG_AMD_XGBE_PHY=m
 # CONFIG_AMD_XGBE_DCB is not set
 
+# HiSilicon
+CONFIG_POWER_RESET_HISI=y
+CONFIG_HISI_THERMAL=m
+
 CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_EN_DCB=y
@@ -162,6 +153,11 @@ CONFIG_DMI_SYSFS=y
 
 CONFIG_SATA_AHCI_PLATFORM=y
 
+CONFIG_LIBNVDIMM=m
+CONFIG_BTT=y
+CONFIG_ND_BTT=m
+CONFIG_ND_BLK=m
+
 # CONFIG_SND_SOC is not set
 
 # CONFIG_PMIC_OPREGION is not set
@@ -170,6 +166,3 @@ CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
 
 # CONFIG_FSL_MC_BUS is not set
-# CONFIG_ARM_TIMER_SP804 is not set
-
-CONFIG_ARM_SMMU_V3=y