Update mvebu-next to 4.12

2017-07-12 21:58:34 +03:00 · 2017-07-12 21:58:34 +03:00 · 887909909f
commit 887909909f
parent 645a23bd1c
5 changed files with 134 additions and 284 deletions
--- a/config/kernel/linux-mvebu-next.config
+++ b/config/kernel/linux-mvebu-next.config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.11.4 Kernel Configuration
+# Linux/arm 4.12.1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@ -106,8 +106,10 @@ CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_TREE_RCU=y
 CONFIG_RCU_EXPERT=y
 CONFIG_SRCU=y
+CONFIG_CLASSIC_SRCU=y
 # CONFIG_TASKS_RCU is not set
 CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
 CONFIG_RCU_FANOUT=32
 CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_TREE_RCU_TRACE is not set
@ -131,7 +133,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
@ -160,7 +162,6 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
-CONFIG_INITRAMFS_COMPRESSION=".gz"
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@ -295,9 +296,10 @@ CONFIG_LBDAF=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
 # CONFIG_BLK_CMDLINE_PARSER is not set
 CONFIG_BLK_WBT=y
 CONFIG_BLK_WBT_SQ=y
@ -325,6 +327,9 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
@ -343,7 +348,6 @@ CONFIG_FREEZER=y
 #
 CONFIG_MMU=y
 CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_GEMINI is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
@ -525,8 +529,19 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y
 # PCI host controller drivers
 #
 CONFIG_PCI_MVEBU=y
+# CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_HOST_GENERIC is not set
 # CONFIG_PCIE_ALTERA is not set
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+
+#
+# PCI switch controller drivers
+#
+# CONFIG_PCI_SW_SWITCHTEC is not set
 # CONFIG_PCCARD is not set

 #
@ -660,6 +675,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPUFREQ_DT=y
 CONFIG_CPUFREQ_DT_PLATDEV=y
 # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
+# CONFIG_ARM_DB8500_CPUFREQ is not set
 # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 # CONFIG_QORIQ_CPUFREQ is not set

@ -1304,6 +1320,13 @@ CONFIG_NET_SCH_HHF=m
 CONFIG_NET_SCH_PIE=m
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_SCH_PLUG=m
+CONFIG_NET_SCH_DEFAULT=y
+# CONFIG_DEFAULT_FQ is not set
+# CONFIG_DEFAULT_CODEL is not set
+# CONFIG_DEFAULT_FQ_CODEL is not set
+# CONFIG_DEFAULT_SFQ is not set
+CONFIG_DEFAULT_PFIFO_FAST=y
+CONFIG_DEFAULT_NET_SCH="pfifo_fast"

 #
 # Classification
@ -1414,7 +1437,9 @@ CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB_RTL=y
 # CONFIG_BT_HCIBTSDIO is not set
 CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
 CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_NOKIA is not set
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
@ -1498,7 +1523,7 @@ CONFIG_HAVE_CBPF_JIT=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
@ -1514,6 +1539,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
@ -1665,7 +1691,6 @@ CONFIG_BLK_DEV_RAM_COUNT=8
 CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-# CONFIG_MG_DISK is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
 CONFIG_NVME_CORE=m
@ -1699,6 +1724,7 @@ CONFIG_BLK_DEV_NVME=m
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y
 CONFIG_SRAM_EXEC=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
 # CONFIG_C2PORT is not set

 #
@ -1939,7 +1965,14 @@ CONFIG_SATA_MV=y
 # CONFIG_ATA_GENERIC is not set
 # CONFIG_PATA_LEGACY is not set
 CONFIG_MD=y
-# CONFIG_BLK_DEV_MD is not set
+CONFIG_BLK_DEV_MD=m
+# CONFIG_MD_LINEAR is not set
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+# CONFIG_MD_MULTIPATH is not set
+# CONFIG_MD_FAULTY is not set
 # CONFIG_BCACHE is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
@ -1954,18 +1987,22 @@ CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_CACHE_CLEANER=m
 # CONFIG_DM_ERA is not set
-# CONFIG_DM_MIRROR is not set
-# CONFIG_DM_RAID is not set
-# CONFIG_DM_ZERO is not set
-# CONFIG_DM_MULTIPATH is not set
-# CONFIG_DM_DELAY is not set
+CONFIG_DM_MIRROR=m
+# CONFIG_DM_LOG_USERSPACE is not set
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+# CONFIG_DM_MULTIPATH_QL is not set
+# CONFIG_DM_MULTIPATH_ST is not set
+CONFIG_DM_DELAY=m
 # CONFIG_DM_UEVENT is not set
 # CONFIG_DM_FLAKEY is not set
-# CONFIG_DM_VERITY is not set
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_FEC is not set
 # CONFIG_DM_SWITCH is not set
-# CONFIG_DM_LOG_WRITES is not set
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
 # CONFIG_TARGET_CORE is not set
 # CONFIG_FUSION is not set

@ -2028,6 +2065,10 @@ CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 # CONFIG_NET_DSA_QCA8K is not set
+# CONFIG_NET_DSA_LOOP is not set
+# CONFIG_NET_DSA_MT7530 is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
 CONFIG_ETHERNET=y
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_VENDOR_ADAPTEC is not set
@ -2098,20 +2139,19 @@ CONFIG_MVPP2=y
 # CONFIG_NET_VENDOR_TI is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
-CONFIG_PHYLIB=y
-CONFIG_SWPHY=y
-CONFIG_LED_TRIGGER_PHY=y
-
-#
-# MDIO bus device drivers
-#
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y

 #
 # MII PHY device drivers
@ -2388,6 +2428,7 @@ CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_NVM=y
 # CONFIG_NVM_DEBUG is not set
 # CONFIG_NVM_RRPC is not set
+# CONFIG_NVM_PBLK is not set

 #
 # Input device support
@ -2446,12 +2487,14 @@ CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_BYD=y
 CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
 CONFIG_MOUSE_PS2_CYPRESS=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MOUSE_PS2_ELANTECH is not set
 # CONFIG_MOUSE_PS2_SENTELIC is not set
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_SMBUS=y
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_BCM5974 is not set
@ -2712,6 +2755,7 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_74XX_MMIO is not set
 # CONFIG_GPIO_ALTERA is not set
 # CONFIG_GPIO_DWAPB is not set
+# CONFIG_GPIO_FTGPIO010 is not set
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_GRGPIO is not set
 # CONFIG_GPIO_MOCKUP is not set
@ -2789,6 +2833,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_ADT7470 is not set
 # CONFIG_SENSORS_ADT7475 is not set
 # CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ASPEED is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS620 is not set
 # CONFIG_SENSORS_DS1621 is not set
@ -2899,6 +2944,7 @@ CONFIG_SENSORS_MAX31790=m
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
 CONFIG_THERMAL=y
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
 # CONFIG_THERMAL_WRITABLE_TRIPS is not set
@ -3063,6 +3109,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
 # CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_TPS6105X is not set
 # CONFIG_TPS65010 is not set
@ -3128,7 +3175,9 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
+CONFIG_REGULATOR_VCTRL=y
 # CONFIG_MEDIA_SUPPORT is not set

 #
@ -3204,7 +3253,6 @@ CONFIG_SND_USB_AUDIO=m
 # CONFIG_SND_USB_TONEPORT is not set
 # CONFIG_SND_USB_VARIAX is not set
 # CONFIG_SND_SOC is not set
-# CONFIG_SOUND_PRIME is not set

 #
 # HID support
@ -3219,9 +3267,11 @@ CONFIG_HID_GENERIC=y
 # Special HID drivers
 #
 # CONFIG_HID_A4TECH is not set
+# CONFIG_HID_ACCUTOUCH is not set
 # CONFIG_HID_ACRUX is not set
 # CONFIG_HID_APPLE is not set
 # CONFIG_HID_APPLEIR is not set
+# CONFIG_HID_ASUS is not set
 # CONFIG_HID_AUREAL is not set
 # CONFIG_HID_BELKIN is not set
 # CONFIG_HID_BETOP_FF is not set
@ -3258,6 +3308,7 @@ CONFIG_HID_GENERIC=y
 # CONFIG_HID_MICROSOFT is not set
 # CONFIG_HID_MONTEREY is not set
 # CONFIG_HID_MULTITOUCH is not set
+# CONFIG_HID_NTI is not set
 # CONFIG_HID_NTRIG is not set
 # CONFIG_HID_ORTEK is not set
 # CONFIG_HID_PANTHERLORD is not set
@ -3305,6 +3356,7 @@ CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
+# CONFIG_USB_PCI is not set
 # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set

 #
@ -3323,13 +3375,11 @@ CONFIG_USB_LEDS_TRIGGER_USBPORT=y
 #
 # CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_XHCI_MVEBU=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=y
 CONFIG_USB_EHCI_HCD_ORION=y
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 # CONFIG_USB_OXU210HP_HCD is not set
@ -3338,7 +3388,6 @@ CONFIG_USB_EHCI_HCD_ORION=y
 # CONFIG_USB_FOTG210_HCD is not set
 # CONFIG_USB_MAX3421_HCD is not set
 # CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_HCD_BCMA is not set
@ -3494,6 +3543,10 @@ CONFIG_USB_ATM=m
 # CONFIG_USB_ISP1301 is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_USB_GADGET is not set
+
+#
+# USB Power Delivery and Type-C drivers
+#
 CONFIG_USB_LED_TRIG=y
 # CONFIG_USB_ULPI_BUS is not set
 # CONFIG_UWB is not set
@ -3531,6 +3584,7 @@ CONFIG_MMC_MVSDIO=y
 # CONFIG_MMC_USDHI6ROL0 is not set
 # CONFIG_MMC_TOSHIBA_PCI is not set
 # CONFIG_MMC_MTK is not set
+# CONFIG_MMC_SDHCI_XENON is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=m
@ -3547,6 +3601,7 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_GPIO is not set
 # CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP3952 is not set
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
 # CONFIG_LEDS_LP5562 is not set
@ -3595,7 +3650,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
-# CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_HCTOSYS is not set
@ -3741,6 +3795,7 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 # Microsoft Hyper-V guest support
 #
+# CONFIG_HYPERV_TSCPAGE is not set
 CONFIG_STAGING=y
 # CONFIG_PRISM2_USB is not set
 # CONFIG_COMEDI is not set
@ -3750,6 +3805,7 @@ CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
+# CONFIG_RTL8723BS is not set
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
@ -3780,6 +3836,12 @@ CONFIG_LNET_MAX_PAYLOAD=1048576
 # CONFIG_MOST is not set
 # CONFIG_KS7010 is not set
 # CONFIG_GREYBUS is not set
+# CONFIG_CRYPTO_DEV_CCREE is not set
+
+#
+# USB Power Delivery and Type-C drivers
+#
+# CONFIG_TYPEC_TCPM is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
 CONFIG_CLKDEV_LOOKUP=y
@ -3848,6 +3910,10 @@ CONFIG_ORION_TIMER=y
 # Broadcom SoC drivers
 #
 # CONFIG_SOC_BRCMSTB is not set
+
+#
+# i.MX SoC drivers
+#
 # CONFIG_SUNXI_SRAM is not set
 # CONFIG_SOC_TI is not set
 # CONFIG_SOC_ZTE is not set
@ -3890,6 +3956,7 @@ CONFIG_ARM_PMU=y
 # Android
 #
 # CONFIG_ANDROID is not set
+CONFIG_DAX=y
 CONFIG_NVMEM=y
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
@ -3903,6 +3970,7 @@ CONFIG_NVMEM=y
 # FSI support
 #
 # CONFIG_FSI is not set
+# CONFIG_TEE is not set

 #
 # Firmware Drivers
@ -3910,6 +3978,7 @@ CONFIG_NVMEM=y
 # CONFIG_FIRMWARE_MEMMAP is not set
 # CONFIG_FW_CFG_SYSFS is not set
 CONFIG_HAVE_ARM_SMCCC=y
+# CONFIG_GOOGLE_FIRMWARE is not set

 #
 # Tegra firmware driver
@ -4262,7 +4331,10 @@ CONFIG_TRACING_SUPPORT=y
 # Runtime Testing
 #
 # CONFIG_LKDTM is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_TEST_SORT is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
 CONFIG_TEST_HEXDUMP=m
 # CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_KSTRTOX is not set
@ -4304,13 +4376,13 @@ CONFIG_ENCRYPTED_KEYS=y
 # CONFIG_KEY_DH_OPERATIONS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITY=y
+# CONFIG_SECURITY_WRITABLE_HOOKS is not set
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=32768
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
 # CONFIG_HARDENED_USERCOPY is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
 CONFIG_SECURITY_SELINUX=y
@ -4339,6 +4411,11 @@ CONFIG_INTEGRITY_AUDIT=y
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=y
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
 CONFIG_CRYPTO=y

 #
@ -4412,7 +4489,7 @@ CONFIG_CRYPTO_XCBC=m
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=y
-# CONFIG_CRYPTO_CRCT10DIF is not set
+CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_POLY1305 is not set
 CONFIG_CRYPTO_MD4=y
@ -4488,6 +4565,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
 #
 # Certificates for signature checking
 #
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM=m
 CONFIG_CRYPTO_SHA1_ARM_NEON=m
@ -4499,6 +4577,7 @@ CONFIG_CRYPTO_AES_ARM=m
 CONFIG_CRYPTO_AES_ARM_BS=m
 CONFIG_CRYPTO_AES_ARM_CE=m
 CONFIG_CRYPTO_GHASH_ARM_CE=m
+CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m
 CONFIG_CRYPTO_CRC32_ARM_CE=y
 CONFIG_CRYPTO_CHACHA20_NEON=m
 # CONFIG_BINARY_PRINTF is not set
@ -4518,7 +4597,7 @@ CONFIG_GENERIC_IO=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
--- a/patch/kernel/mvebu-next/800-Add_Armada_38x_support_for_clk-cpu.patch
+++ b/patch/kernel/mvebu-next/800-Add_Armada_38x_support_for_clk-cpu.patch
@ -40,7 +40,7 @@ index 7f28506e..292cc378 100644
 +	clock-names = "cpu0";
 +};
 diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c
-index 044892b6..43cdf0fb 100644
+index 072aa383..7653df49 100644
 --- a/drivers/clk/mvebu/clk-cpu.c
 +++ b/drivers/clk/mvebu/clk-cpu.c
@@ -20,16 +20,34 @@
@ -314,11 +314,10 @@ index 044892b6..43cdf0fb 100644
 		return;
 	}
 
-@@ -185,7 +282,20 @@ static void __init of_cpu_clk_setup(struct device_node *node)
- 
+@@ -186,6 +283,21 @@ static void __init of_cpu_clk_setup(struct device_node *node)
 	for_each_node_by_type(dn, "cpu")
 		ncpus++;
-
+ 
 +	if (cortexa9) {
 +		if (dfx_server_base == NULL) {
 +			pr_err("%s: DFX server base register not set\n",
@ -333,10 +332,11 @@ index 044892b6..43cdf0fb 100644
 +		for_each_node_by_type(dn, "cpu")
 +			ncpus++;
 +	}
- 	cpuclk = kzalloc(ncpus * sizeof(*cpuclk), GFP_KERNEL);
+
+ 	cpuclk = kcalloc(ncpus, sizeof(*cpuclk), GFP_KERNEL);
 	if (WARN_ON(!cpuclk))
 		goto cpuclk_out;
-@@ -215,10 +325,12 @@ static void __init of_cpu_clk_setup(struct device_node *node)
+@@ -215,10 +327,12 @@ static void __init of_cpu_clk_setup(struct device_node *node)
 		cpuclk[cpu].reg_base = clock_complex_base;
 		if (pmu_dfs_base)
 			cpuclk[cpu].pmu_dfs = pmu_dfs_base + 4 * cpu;
@ -350,7 +350,7 @@ index 044892b6..43cdf0fb 100644
 		init.flags = 0;
 		init.parent_names = &cpuclk[cpu].parent_name;
 		init.num_parents = 1;
-@@ -227,6 +339,11 @@ static void __init of_cpu_clk_setup(struct device_node *node)
+@@ -227,6 +341,11 @@ static void __init of_cpu_clk_setup(struct device_node *node)
 		if (WARN_ON(IS_ERR(clk)))
 			goto bail_out;
 		clks[cpu] = clk;
@ -362,7 +362,7 @@ index 044892b6..43cdf0fb 100644
 	}
 	clk_data.clk_num = MAX_CPU;
 	clk_data.clks = clks;
-@@ -241,10 +358,25 @@ static void __init of_cpu_clk_setup(struct device_node *node)
+@@ -241,10 +360,25 @@ static void __init of_cpu_clk_setup(struct device_node *node)
 	kfree(cpuclk);
 cpuclk_out:
 	iounmap(clock_complex_base);
--- a/patch/kernel/mvebu-next/packaging-4.x-NEXT-with-postinstall-scripts.patch
+++ b/patch/kernel/mvebu-next/packaging-4.x-NEXT-with-postinstall-scripts.patch
@ -1,10 +1,10 @@
 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 6c3b038..cc9b3c0 100755
+index aad67000..006d8ec7 100755
 --- a/scripts/package/builddeb
 +++ b/scripts/package/builddeb
-@@ -27,6 +27,28 @@ create_package() {
- 	chown -R root:root "$pdir"
- 	chmod -R go-w "$pdir"
+@@ -29,6 +29,28 @@ create_package() {
+ 	# in case we are in a restrictive umask environment like 0077
+ 	chmod -R a+rX "$pdir"
 
 +	# Create preinstall and post install script to remove dtb
 +	if [[ "$1" == *dtb* ]]; then
@ -20,18 +20,18 @@ index 6c3b038..cc9b3c0 100755
 +		echo "exit 0" >> $pdir/DEBIAN/postinst
 +		chmod 775 $pdir/DEBIAN/postinst
 +	fi
-+	
+
 +	# Create postinstall script for headers
 +	if [[ "$1" == *headers* ]]; then
 +		echo "cd /usr/src/linux-headers-$version; echo \"Compiling headers - please wait ...\"; make -s scripts >/dev/null 2>&1" >> $pdir/DEBIAN/postinst
 +		echo "exit 0" >> $pdir/DEBIAN/postinst
 +		chmod 775 $pdir/DEBIAN/postinst
 +	fi
-+	
+
 	# Create the package
 	dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir"
 	dpkg --build "$pdir" ..
-@@ -93,11 +115,13 @@ tmpdir="$objtree/debian/tmp"
+@@ -95,11 +117,13 @@ tmpdir="$objtree/debian/tmp"
 fwdir="$objtree/debian/fwtmp"
 kernel_headers_dir="$objtree/debian/hdrtmp"
 libc_headers_dir="$objtree/debian/headertmp"
@ -49,7 +49,7 @@ index 6c3b038..cc9b3c0 100755
 dbg_packagename=$packagename-dbg
 debarch=
 forcearch=
-@@ -124,7 +148,9 @@ esac
+@@ -126,7 +150,9 @@ esac
 BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
 
 # Setup the directory structure
@ -60,7 +60,7 @@ index 6c3b038..cc9b3c0 100755
 mkdir -m 755 -p "$tmpdir/DEBIAN"
 mkdir -p "$tmpdir/lib" "$tmpdir/boot"
 mkdir -p "$fwdir/lib/firmware/$version/"
-@@ -183,6 +209,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
+@@ -180,6 +206,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
 	fi
 fi
 
@ -72,28 +72,7 @@ index 6c3b038..cc9b3c0 100755
 if [ "$ARCH" != "um" ]; then
 	$MAKE headers_check KBUILD_SRC=
 	$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
-@@ -195,7 +226,7 @@ fi
- # so do we; recent versions of dracut and initramfs-tools will obey this.
- debhookdir=${KDEB_HOOKDIR:-/etc/kernel}
- if grep -q '^CONFIG_BLK_DEV_INITRD=y' $KCONFIG_CONFIG; then
-	want_initrd=Yes
-+	want_initrd=Yes 
- else
- 	want_initrd=No
- fi
-@@ -207,9 +238,11 @@ for script in postinst postrm preinst prerm ; do
- set -e
- 
- # Pass maintainer script parameters to hook scripts
-+
- export DEB_MAINT_PARAMS="\$*"
- 
- # Tell initramfs builder whether it's wanted
-+
- export INITRD=$want_initrd
- 
- test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
-@@ -218,6 +251,55 @@ EOF
+@@ -215,6 +246,55 @@ EOF
 	chmod 755 "$tmpdir/DEBIAN/$script"
 done
 
@ -149,33 +128,23 @@ index 6c3b038..cc9b3c0 100755
 # Try to determine maintainer and email values
 if [ -n "$DEBEMAIL" ]; then
        email=$DEBEMAIL
-@@ -328,16 +414,24 @@ fi
- (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
+@@ -329,12 +409,15 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then
+ fi
 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
 mkdir -p "$destdir"
-+######################## headers patch
-+ZACNI=$(pwd)
-+cd $destdir
-+patch -p1 < /tmp/headers-debian-byteshift.patch
-+cd $ZACNI
-+######################## headers patch
+(cd $destdir; patch -p1 < /tmp/headers-debian-byteshift.patch)
 (cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
 (cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)
 (cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
 ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
 rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
 
-+(cd "$destdir"; make M=scripts clean)
+(cd $destdir; make M=scripts clean)
 +
 cat <<EOF >> debian/control
 
 Package: $kernel_headers_packagename
-Provides: linux-headers, linux-headers-2.6
-+Provides: linux-headers
- Architecture: any
- Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
-  This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
-@@ -363,6 +457,16 @@ fi
+@@ -363,6 +446,16 @@ fi
 
 cat <<EOF >> debian/control
 
@ -192,7 +161,7 @@ index 6c3b038..cc9b3c0 100755
 Package: $libc_headers_packagename
 Section: devel
 Provides: linux-kernel-headers
-@@ -374,7 +478,7 @@ EOF
+@@ -374,7 +467,7 @@ EOF
 
 if [ "$ARCH" != "um" ]; then
 	create_package "$kernel_headers_packagename" "$kernel_headers_dir"
--- a/patch/kernel/mvebu-next/resolve-crypto-deps.patch
+++ b/patch/kernel/mvebu-next/resolve-crypto-deps.patch
@ -1,198 +0,0 @@
-From b56f5cbc7e08ec7d31c42fc41e5247677f20b143 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Date: Tue, 14 Feb 2017 21:51:01 +0000
-Subject: crypto: arm/aes-neonbs - resolve fallback cipher at runtime
-
-Currently, the bit sliced NEON AES code for ARM has a link time
-dependency on the scalar ARM asm implementation, which it uses as a
-fallback to perform CBC encryption and the encryption of the initial
-XTS tweak.
-
-The bit sliced NEON code is both fast and time invariant, which makes
-it a reasonable default on hardware that supports it. However, the
-ARM asm code it pulls in is not time invariant, and due to the way it
-is linked in, cannot be overridden by the new generic time invariant
-driver. In fact, it will not be used at all, given that the ARM asm
-code registers itself as a cipher with a priority that exceeds the
-priority of the fixed time cipher.
-
-So remove the link time dependency, and allocate the fallback cipher
-via the crypto API. Note that this requires this driver's module_init
-call to be replaced with late_initcall, so that the (possibly generic)
-fallback cipher is guaranteed to be available when the builtin test
-is performed at registration time.
-
-Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
- arch/arm/crypto/Kconfig           |  2 +-
- arch/arm/crypto/aes-neonbs-glue.c | 60 +++++++++++++++++++++++++++++----------
- 2 files changed, 46 insertions(+), 16 deletions(-)
-
-diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig
-index a8fce93..b9adedc 100644
--- a/arch/arm/crypto/Kconfig
-+++ b/arch/arm/crypto/Kconfig
-@@ -73,7 +73,7 @@ config CRYPTO_AES_ARM_BS
- 	depends on KERNEL_MODE_NEON
- 	select CRYPTO_BLKCIPHER
- 	select CRYPTO_SIMD
-	select CRYPTO_AES_ARM
-+	select CRYPTO_AES
- 	help
- 	  Use a faster and more secure NEON based implementation of AES in CBC,
- 	  CTR and XTS modes
-diff --git a/arch/arm/crypto/aes-neonbs-glue.c b/arch/arm/crypto/aes-neonbs-glue.c
-index 2920b96..c763779 100644
--- a/arch/arm/crypto/aes-neonbs-glue.c
-+++ b/arch/arm/crypto/aes-neonbs-glue.c
-@@ -42,9 +42,6 @@ asmlinkage void aesbs_xts_encrypt(u8 out[], u8 const in[], u8 const rk[],
- asmlinkage void aesbs_xts_decrypt(u8 out[], u8 const in[], u8 const rk[],
- 				  int rounds, int blocks, u8 iv[]);
- 
-asmlinkage void __aes_arm_encrypt(const u32 rk[], int rounds, const u8 in[],
-				  u8 out[]);
-
- struct aesbs_ctx {
- 	int	rounds;
- 	u8	rk[13 * (8 * AES_BLOCK_SIZE) + 32] __aligned(AES_BLOCK_SIZE);
-@@ -52,12 +49,12 @@ struct aesbs_ctx {
- 
- struct aesbs_cbc_ctx {
- 	struct aesbs_ctx	key;
-	u32			enc[AES_MAX_KEYLENGTH_U32];
-+	struct crypto_cipher	*enc_tfm;
- };
- 
- struct aesbs_xts_ctx {
- 	struct aesbs_ctx	key;
-	u32			twkey[AES_MAX_KEYLENGTH_U32];
-+	struct crypto_cipher	*tweak_tfm;
- };
- 
- static int aesbs_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
-@@ -132,20 +129,18 @@ static int aesbs_cbc_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
- 
- 	ctx->key.rounds = 6 + key_len / 4;
- 
-	memcpy(ctx->enc, rk.key_enc, sizeof(ctx->enc));
-
- 	kernel_neon_begin();
- 	aesbs_convert_key(ctx->key.rk, rk.key_enc, ctx->key.rounds);
- 	kernel_neon_end();
- 
-	return 0;
-+	return crypto_cipher_setkey(ctx->enc_tfm, in_key, key_len);
- }
- 
- static void cbc_encrypt_one(struct crypto_skcipher *tfm, const u8 *src, u8 *dst)
- {
- 	struct aesbs_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);
- 
-	__aes_arm_encrypt(ctx->enc, ctx->key.rounds, src, dst);
-+	crypto_cipher_encrypt_one(ctx->enc_tfm, dst, src);
- }
- 
- static int cbc_encrypt(struct skcipher_request *req)
-@@ -181,6 +176,23 @@ static int cbc_decrypt(struct skcipher_request *req)
- 	return err;
- }
- 
-+static int cbc_init(struct crypto_tfm *tfm)
-+{
-+	struct aesbs_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
-+
-+	ctx->enc_tfm = crypto_alloc_cipher("aes", 0, 0);
-+	if (IS_ERR(ctx->enc_tfm))
-+		return PTR_ERR(ctx->enc_tfm);
-+	return 0;
-+}
-+
-+static void cbc_exit(struct crypto_tfm *tfm)
-+{
-+	struct aesbs_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
-+
-+	crypto_free_cipher(ctx->enc_tfm);
-+}
-+
- static int ctr_encrypt(struct skcipher_request *req)
- {
- 	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
-@@ -228,7 +240,6 @@ static int aesbs_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
- 			    unsigned int key_len)
- {
- 	struct aesbs_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
-	struct crypto_aes_ctx rk;
- 	int err;
- 
- 	err = xts_verify_key(tfm, in_key, key_len);
-@@ -236,15 +247,30 @@ static int aesbs_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
- 		return err;
- 
- 	key_len /= 2;
-	err = crypto_aes_expand_key(&rk, in_key + key_len, key_len);
-+	err = crypto_cipher_setkey(ctx->tweak_tfm, in_key + key_len, key_len);
- 	if (err)
- 		return err;
- 
-	memcpy(ctx->twkey, rk.key_enc, sizeof(ctx->twkey));
-
- 	return aesbs_setkey(tfm, in_key, key_len);
- }
- 
-+static int xts_init(struct crypto_tfm *tfm)
-+{
-+	struct aesbs_xts_ctx *ctx = crypto_tfm_ctx(tfm);
-+
-+	ctx->tweak_tfm = crypto_alloc_cipher("aes", 0, 0);
-+	if (IS_ERR(ctx->tweak_tfm))
-+		return PTR_ERR(ctx->tweak_tfm);
-+	return 0;
-+}
-+
-+static void xts_exit(struct crypto_tfm *tfm)
-+{
-+	struct aesbs_xts_ctx *ctx = crypto_tfm_ctx(tfm);
-+
-+	crypto_free_cipher(ctx->tweak_tfm);
-+}
-+
- static int __xts_crypt(struct skcipher_request *req,
- 		       void (*fn)(u8 out[], u8 const in[], u8 const rk[],
- 				  int rounds, int blocks, u8 iv[]))
-@@ -256,7 +282,7 @@ static int __xts_crypt(struct skcipher_request *req,
- 
- 	err = skcipher_walk_virt(&walk, req, true);
- 
-	__aes_arm_encrypt(ctx->twkey, ctx->key.rounds, walk.iv, walk.iv);
-+	crypto_cipher_encrypt_one(ctx->tweak_tfm, walk.iv, walk.iv);
- 
- 	kernel_neon_begin();
- 	while (walk.nbytes >= AES_BLOCK_SIZE) {
-@@ -309,6 +335,8 @@ static struct skcipher_alg aes_algs[] = { {
- 	.base.cra_ctxsize	= sizeof(struct aesbs_cbc_ctx),
- 	.base.cra_module	= THIS_MODULE,
- 	.base.cra_flags		= CRYPTO_ALG_INTERNAL,
-+	.base.cra_init		= cbc_init,
-+	.base.cra_exit		= cbc_exit,
- 
- 	.min_keysize		= AES_MIN_KEY_SIZE,
- 	.max_keysize		= AES_MAX_KEY_SIZE,
-@@ -342,6 +370,8 @@ static struct skcipher_alg aes_algs[] = { {
- 	.base.cra_ctxsize	= sizeof(struct aesbs_xts_ctx),
- 	.base.cra_module	= THIS_MODULE,
- 	.base.cra_flags		= CRYPTO_ALG_INTERNAL,
-+	.base.cra_init		= xts_init,
-+	.base.cra_exit		= xts_exit,
- 
- 	.min_keysize		= 2 * AES_MIN_KEY_SIZE,
- 	.max_keysize		= 2 * AES_MAX_KEY_SIZE,
-@@ -402,5 +432,5 @@ unregister_simds:
- 	return err;
- }
- 
-module_init(aes_init);
-+late_initcall(aes_init);
- module_exit(aes_exit);
-- 
-cgit v1.1
--- a/patch/kernel/mvebu-next/unlock_atheros_regulatory_restrictions.patch.disabled
+++ b/patch/kernel/mvebu-next/unlock_atheros_regulatory_restrictions.patch.disabled