Merge tag 'zte-defconfig64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull "ZTE arm64 defconfig updates for 4.9" from Shawn Guo:
 - Enable ZTE ZX family support in arm64 defconfig

* tag 'zte-defconfig64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: defconfig: enable ZTE ZX related config

diff --combined arch/arm64/configs/defconfig
index c3a9bf2,060b796..dab2cb0
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -1,3 -1,4 +1,3 @@@
 -# CONFIG_LOCALVERSION_AUTO is not set
  CONFIG_SYSVIPC=y
  CONFIG_POSIX_MQUEUE=y
  CONFIG_AUDIT=y
@@@ -14,14 -15,10 +14,14 @@@ CONFIG_IKCONFIG_PROC=
  CONFIG_LOG_BUF_SHIFT=14
  CONFIG_MEMCG=y
  CONFIG_MEMCG_SWAP=y
 +CONFIG_BLK_CGROUP=y
 +CONFIG_CGROUP_PIDS=y
  CONFIG_CGROUP_HUGETLB=y
 -# CONFIG_UTS_NS is not set
 -# CONFIG_IPC_NS is not set
 -# CONFIG_NET_NS is not set
 +CONFIG_CPUSETS=y
 +CONFIG_CGROUP_DEVICE=y
 +CONFIG_CGROUP_CPUACCT=y
 +CONFIG_CGROUP_PERF=y
 +CONFIG_USER_NS=y
  CONFIG_SCHED_AUTOGROUP=y
  CONFIG_BLK_DEV_INITRD=y
  CONFIG_KALLSYMS_ALL=y
@@@ -57,11 -54,11 +57,12 @@@ CONFIG_ARCH_UNIPHIER=
  CONFIG_ARCH_VEXPRESS=y
  CONFIG_ARCH_VULCAN=y
  CONFIG_ARCH_XGENE=y
+ CONFIG_ARCH_ZX=y
  CONFIG_ARCH_ZYNQMP=y
  CONFIG_PCI=y
  CONFIG_PCI_MSI=y
  CONFIG_PCI_IOV=y
 +CONFIG_PCI_AARDVARK=y
  CONFIG_PCIE_RCAR=y
  CONFIG_PCI_HOST_GENERIC=y
  CONFIG_PCI_XGENE=y
@@@ -75,7 -72,6 +76,7 @@@ CONFIG_PREEMPT=
  CONFIG_KSM=y
  CONFIG_TRANSPARENT_HUGEPAGE=y
  CONFIG_CMA=y
 +CONFIG_SECCOMP=y
  CONFIG_XEN=y
  CONFIG_KEXEC=y
  # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@@ -83,53 -79,17 +84,53 @@@ CONFIG_COMPAT=
  CONFIG_CPU_IDLE=y
  CONFIG_ARM_CPUIDLE=y
  CONFIG_CPU_FREQ=y
 +CONFIG_CPUFREQ_DT=y
  CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
  CONFIG_ARM_SCPI_CPUFREQ=y
  CONFIG_NET=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
  CONFIG_INET=y
 +CONFIG_IP_MULTICAST=y
  CONFIG_IP_PNP=y
  CONFIG_IP_PNP_DHCP=y
  CONFIG_IP_PNP_BOOTP=y
 -# CONFIG_IPV6 is not set
 +CONFIG_IPV6=m
 +CONFIG_NETFILTER=y
 +CONFIG_NF_CONNTRACK=m
 +CONFIG_NF_CONNTRACK_EVENTS=y
 +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 +CONFIG_NETFILTER_XT_TARGET_LOG=m
 +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
 +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 +CONFIG_NF_CONNTRACK_IPV4=m
 +CONFIG_IP_NF_IPTABLES=m
 +CONFIG_IP_NF_FILTER=m
 +CONFIG_IP_NF_TARGET_REJECT=m
 +CONFIG_IP_NF_NAT=m
 +CONFIG_IP_NF_TARGET_MASQUERADE=m
 +CONFIG_IP_NF_MANGLE=m
 +CONFIG_NF_CONNTRACK_IPV6=m
 +CONFIG_IP6_NF_IPTABLES=m
 +CONFIG_IP6_NF_FILTER=m
 +CONFIG_IP6_NF_TARGET_REJECT=m
 +CONFIG_IP6_NF_MANGLE=m
 +CONFIG_IP6_NF_NAT=m
 +CONFIG_IP6_NF_TARGET_MASQUERADE=m
 +CONFIG_BRIDGE=m
 +CONFIG_BRIDGE_VLAN_FILTERING=y
 +CONFIG_VLAN_8021Q=m
 +CONFIG_VLAN_8021Q_GVRP=y
 +CONFIG_VLAN_8021Q_MVRP=y
  CONFIG_BPF_JIT=y
 +CONFIG_BT=m
 +CONFIG_BT_HIDP=m
 +# CONFIG_BT_HS is not set
 +# CONFIG_BT_LE is not set
 +CONFIG_BT_LEDS=y
 +# CONFIG_BT_DEBUGFS is not set
 +CONFIG_BT_HCIUART=m
 +CONFIG_BT_HCIUART_LL=y
  CONFIG_CFG80211=m
  CONFIG_MAC80211=m
  CONFIG_MAC80211_LEDS=y
@@@ -144,13 -104,11 +145,13 @@@ CONFIG_MTD=
  CONFIG_MTD_M25P80=y
  CONFIG_MTD_SPI_NOR=y
  CONFIG_BLK_DEV_LOOP=y
 +CONFIG_BLK_DEV_NBD=m
  CONFIG_VIRTIO_BLK=y
  CONFIG_SRAM=y
  # CONFIG_SCSI_PROC_FS is not set
  CONFIG_BLK_DEV_SD=y
 -# CONFIG_SCSI_LOWLEVEL is not set
 +CONFIG_SCSI_SAS_ATA=y
 +CONFIG_SCSI_HISI_SAS=y
  CONFIG_ATA=y
  CONFIG_SATA_AHCI=y
  CONFIG_SATA_AHCI_PLATFORM=y
@@@ -163,16 -121,11 +164,16 @@@ CONFIG_SATA_SIL24=
  CONFIG_PATA_PLATFORM=y
  CONFIG_PATA_OF_PLATFORM=y
  CONFIG_NETDEVICES=y
 +CONFIG_MACVLAN=m
 +CONFIG_MACVTAP=m
  CONFIG_TUN=y
 +CONFIG_VETH=m
  CONFIG_VIRTIO_NET=y
  CONFIG_AMD_XGBE=y
  CONFIG_NET_XGENE=y
  CONFIG_MACB=y
 +CONFIG_HNS_DSAF=y
 +CONFIG_HNS_ENET=y
  CONFIG_E1000E=y
  CONFIG_IGB=y
  CONFIG_IGBVF=y
@@@ -199,7 -152,6 +200,7 @@@ CONFIG_INPUT_EVDEV=
  CONFIG_KEYBOARD_GPIO=y
  CONFIG_INPUT_MISC=y
  CONFIG_INPUT_PM8941_PWRKEY=y
 +CONFIG_INPUT_HISI_POWERKEY=y
  # CONFIG_SERIO_SERPORT is not set
  CONFIG_SERIO_AMBAKMI=y
  CONFIG_LEGACY_PTY_COUNT=16
@@@ -225,12 -177,12 +226,12 @@@ CONFIG_SERIAL_XILINX_PS_UART=
  CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
  CONFIG_SERIAL_MVEBU_UART=y
  CONFIG_VIRTIO_CONSOLE=y
 -# CONFIG_HW_RANDOM is not set
  CONFIG_I2C_CHARDEV=y
  CONFIG_I2C_MUX=y
  CONFIG_I2C_MUX_PCA954x=y
  CONFIG_I2C_DESIGNWARE_PLATFORM=y
  CONFIG_I2C_IMX=y
 +CONFIG_I2C_MESON=y
  CONFIG_I2C_MV64XXX=y
  CONFIG_I2C_QUP=y
  CONFIG_I2C_TEGRA=y
@@@ -238,7 -190,6 +239,7 @@@ CONFIG_I2C_UNIPHIER_F=
  CONFIG_I2C_RCAR=y
  CONFIG_I2C_CROS_EC_TUNNEL=y
  CONFIG_SPI=y
 +CONFIG_SPI_MESON_SPIFC=m
  CONFIG_SPI_ORION=y
  CONFIG_SPI_PL022=y
  CONFIG_SPI_QUP=y
@@@ -249,7 -200,6 +250,7 @@@ CONFIG_PINCTRL_SINGLE=
  CONFIG_PINCTRL_MAX77620=y
  CONFIG_PINCTRL_MSM8916=y
  CONFIG_PINCTRL_MSM8996=y
 +CONFIG_PINCTRL_QDF2XXX=y
  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
  CONFIG_GPIO_SYSFS=y
  CONFIG_GPIO_DWAPB=y
@@@ -268,14 -218,10 +269,14 @@@ CONFIG_SENSORS_INA2XX=
  CONFIG_SENSORS_ARM_SCPI=y
  CONFIG_THERMAL=y
  CONFIG_THERMAL_EMULATION=y
 +CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 +CONFIG_CPU_THERMAL=y
  CONFIG_EXYNOS_THERMAL=y
  CONFIG_WATCHDOG=y
  CONFIG_RENESAS_WDT=y
  CONFIG_S3C2410_WATCHDOG=y
 +CONFIG_MESON_GXBB_WATCHDOG=m
 +CONFIG_MESON_WATCHDOG=m
  CONFIG_MFD_MAX77620=y
  CONFIG_MFD_SPMI_PMIC=y
  CONFIG_MFD_SEC_CORE=y
@@@ -284,7 -230,6 +285,7 @@@ CONFIG_REGULATOR=
  CONFIG_MFD_CROS_EC=y
  CONFIG_MFD_CROS_EC_I2C=y
  CONFIG_REGULATOR_FIXED_VOLTAGE=y
 +CONFIG_REGULATOR_GPIO=y
  CONFIG_REGULATOR_HI655X=y
  CONFIG_REGULATOR_MAX77620=y
  CONFIG_REGULATOR_PWM=y
@@@ -295,8 -240,6 +296,8 @@@ CONFIG_DRM=
  CONFIG_DRM_NOUVEAU=m
  CONFIG_DRM_TEGRA=m
  CONFIG_DRM_PANEL_SIMPLE=m
 +CONFIG_DRM_I2C_ADV7511=m
 +CONFIG_DRM_HISI_KIRIN=m
  CONFIG_FB=y
  CONFIG_FB_ARMCLCD=y
  CONFIG_BACKLIGHT_GENERIC=m
@@@ -314,7 -257,6 +315,7 @@@ CONFIG_SND_SOC_AK4613=
  CONFIG_USB=y
  CONFIG_USB_OTG=y
  CONFIG_USB_XHCI_HCD=y
 +CONFIG_USB_XHCI_PLATFORM=y
  CONFIG_USB_XHCI_RCAR=y
  CONFIG_USB_EHCI_EXYNOS=y
  CONFIG_USB_XHCI_TEGRA=y
@@@ -324,7 -266,6 +325,7 @@@ CONFIG_USB_EHCI_HCD_PLATFORM=
  CONFIG_USB_OHCI_EXYNOS=y
  CONFIG_USB_OHCI_HCD=y
  CONFIG_USB_OHCI_HCD_PLATFORM=y
 +CONFIG_USB_RENESAS_USBHS=m
  CONFIG_USB_STORAGE=y
  CONFIG_USB_DWC2=y
  CONFIG_USB_DWC3=y
@@@ -336,18 -277,15 +337,18 @@@ CONFIG_USB_HSIC_USB3503=
  CONFIG_USB_MSM_OTG=y
  CONFIG_USB_ULPI=y
  CONFIG_USB_GADGET=y
 +CONFIG_USB_RENESAS_USBHS_UDC=m
  CONFIG_MMC=y
  CONFIG_MMC_BLOCK_MINORS=32
  CONFIG_MMC_ARMMMCI=y
  CONFIG_MMC_SDHCI=y
 +CONFIG_MMC_SDHCI_ACPI=y
  CONFIG_MMC_SDHCI_PLTFM=y
  CONFIG_MMC_SDHCI_OF_ESDHC=y
  CONFIG_MMC_SDHCI_TEGRA=y
  CONFIG_MMC_SDHCI_MSM=y
  CONFIG_MMC_SPI=y
 +CONFIG_MMC_SDHI=y
  CONFIG_MMC_DW=y
  CONFIG_MMC_DW_EXYNOS=y
  CONFIG_MMC_DW_K3=y
@@@ -373,8 -311,6 +374,8 @@@ CONFIG_DMADEVICES=
  CONFIG_PL330_DMA=y
  CONFIG_TEGRA20_APB_DMA=y
  CONFIG_QCOM_BAM_DMA=y
 +CONFIG_QCOM_HIDMA_MGMT=y
 +CONFIG_QCOM_HIDMA=y
  CONFIG_RCAR_DMAC=y
  CONFIG_VFIO=y
  CONFIG_VFIO_PCI=y
@@@ -415,16 -351,12 +416,16 @@@ CONFIG_EXYNOS_ADC=
  CONFIG_PWM_SAMSUNG=y
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
 +CONFIG_EXT4_FS_POSIX_ACL=y
 +CONFIG_BTRFS_FS=m
 +CONFIG_BTRFS_FS_POSIX_ACL=y
  CONFIG_FANOTIFY=y
  CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
  CONFIG_QUOTA=y
  CONFIG_AUTOFS4_FS=y
 -CONFIG_FUSE_FS=y
 -CONFIG_CUSE=y
 +CONFIG_FUSE_FS=m
 +CONFIG_CUSE=m
 +CONFIG_OVERLAY_FS=m
  CONFIG_VFAT_FS=y
  CONFIG_TMPFS=y
  CONFIG_HUGETLBFS=y