--- /boot/config-4.5.4-zgbpi-armmp-lpae	2016-05-13 17:02:25.000000000 +0200
+++ /boot/config-4.6.0-zgbpi-armmp-lpae	2016-05-16 14:18:06.000000000 +0200
@@ -3 +3 @@
-# Linux/arm 4.5.4 Kernel Configuration
+# Linux/arm 4.6.0 Kernel Configuration
@@ -173,0 +174,2 @@
+# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
+CONFIG_KALLSYMS_BASE_RELATIVE=y
@@ -183 +185 @@
-# CONFIG_BPF_SYSCALL is not set
+CONFIG_BPF_SYSCALL=y
@@ -368,0 +371 @@
+# CONFIG_ARCH_ARTPEC is not set
@@ -463 +466,2 @@
-# CONFIG_ARM_KERNMEM_PERMS is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_ALIGN_RODATA=y
@@ -712 +715,0 @@
-CONFIG_INET_LRO=m
@@ -1126 +1128,0 @@
-CONFIG_NETLINK_MMAP=y
@@ -1167,0 +1170 @@
+# CONFIG_BT_LEDS is not set
@@ -1181,0 +1185 @@
+CONFIG_AF_KCM=m
@@ -1207,0 +1212,3 @@
+CONFIG_DST_CACHE=y
+CONFIG_NET_DEVLINK=m
+CONFIG_MAY_USE_DEVLINK=m
@@ -1234 +1241 @@
-CONFIG_REGMAP_SPI=m
+CONFIG_REGMAP_SPI=y
@@ -1236 +1242,0 @@
-CONFIG_REGMAP_IRQ=y
@@ -1246 +1252 @@
-# CONFIG_ARM_CCI500_PMU is not set
+# CONFIG_ARM_CCI5xx_PMU is not set
@@ -1407,0 +1414 @@
+# CONFIG_PANEL is not set
@@ -1440,0 +1448,4 @@
+# VOP Bus Driver
+#
+
+#
@@ -1454,0 +1466,4 @@
+
+#
+# VOP Driver
+#
@@ -1575,0 +1591 @@
+# CONFIG_MACSEC is not set
@@ -1816,0 +1833 @@
+# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
@@ -1829 +1845,0 @@
-# CONFIG_TOUCHSCREEN_TS4800 is not set
@@ -1856 +1871,0 @@
-# CONFIG_INPUT_AXP20X_PEK is not set
@@ -1869,0 +1885 @@
+# CONFIG_RMI4_CORE is not set
@@ -1922 +1937,0 @@
-# CONFIG_SERIAL_8250_INGENIC is not set
@@ -1951,0 +1967 @@
+# CONFIG_SERIAL_MVEBU_UART is not set
@@ -1981,0 +1998 @@
+# CONFIG_I2C_DEMUX_PINCTRL is not set
@@ -2031,0 +2049 @@
+# CONFIG_SPI_AXI_SPI_ENGINE is not set
@@ -2034,0 +2053 @@
+# CONFIG_SPI_DESIGNWARE is not set
@@ -2048 +2066,0 @@
-# CONFIG_SPI_DESIGNWARE is not set
@@ -2097 +2115 @@
-CONFIG_PINCTRL_SUNXI_COMMON=y
+CONFIG_PINCTRL_SUNXI=y
@@ -2109,0 +2128 @@
+CONFIG_PINCTRL_SUN8I_H3_R=y
@@ -2131,0 +2151 @@
+# CONFIG_GPIO_MPC8XXX is not set
@@ -2147,0 +2168 @@
+# CONFIG_GPIO_TPIC2810 is not set
@@ -2159,0 +2181 @@
+# CONFIG_GPIO_PISOSR is not set
@@ -2195 +2216,0 @@
-CONFIG_AXP20X_POWER=y
@@ -2246,0 +2268 @@
+# CONFIG_SENSORS_LTC2990 is not set
@@ -2364 +2385,0 @@
-# CONFIG_TS4800_WATCHDOG is not set
@@ -2366 +2386,0 @@
-# CONFIG_BCM7038_WDT is not set
@@ -2389,0 +2410 @@
+# CONFIG_MFD_ACT8945A is not set
@@ -2397 +2418,2 @@
-CONFIG_MFD_AXP20X=y
+# CONFIG_MFD_AXP20X_I2C is not set
+# CONFIG_MFD_AXP20X_RSB is not set
@@ -2454,0 +2477 @@
+# CONFIG_MFD_TPS65086 is not set
@@ -2460 +2482,0 @@
-# CONFIG_MFD_TPS65912 is not set
@@ -2491 +2512,0 @@
-# CONFIG_REGULATOR_AXP20X is not set
@@ -2566,0 +2588,5 @@
+# ACP (Audio CoProcessor) Configuration
+#
+# CONFIG_DRM_AMD_ACP is not set
+
+#
@@ -2636,0 +2663 @@
+CONFIG_SND_JACK_INPUT_DEV=y
@@ -2702,0 +2730 @@
+# CONFIG_SND_SUN4I_SPDIF is not set
@@ -2732 +2760,2 @@
-# CONFIG_SND_SOC_PCM179X is not set
+# CONFIG_SND_SOC_PCM179X_I2C is not set
+# CONFIG_SND_SOC_PCM179X_SPI is not set
@@ -2736,0 +2766 @@
+# CONFIG_SND_SOC_RT5616 is not set
@@ -2801,0 +2832 @@
+# CONFIG_HID_CMEDIA is not set
@@ -3153,0 +3185 @@
+# CONFIG_LEDS_IS31FL32XX is not set
@@ -3208 +3239,0 @@
-# CONFIG_RTC_DRV_DS3232 is not set
@@ -3216 +3246,0 @@
-# CONFIG_RTC_DRV_PCF2127 is not set
@@ -3218 +3247,0 @@
-# CONFIG_RTC_DRV_PCF8563 is not set
@@ -3219,0 +3249 @@
+# CONFIG_RTC_DRV_PCF8563 is not set
@@ -3242 +3271,0 @@
-# CONFIG_RTC_DRV_MAX6902 is not set
@@ -3243,0 +3273,2 @@
+# CONFIG_RTC_DRV_RX4581 is not set
+# CONFIG_RTC_DRV_RX6110 is not set
@@ -3245 +3276 @@
-# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
@@ -3247 +3277,0 @@
-# CONFIG_RTC_DRV_RX4581 is not set
@@ -3248,0 +3279,7 @@
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
@@ -3298,0 +3336,2 @@
+# CONFIG_QCOM_HIDMA_MGMT is not set
+# CONFIG_QCOM_HIDMA is not set
@@ -3324 +3362,0 @@
-# CONFIG_PANEL is not set
@@ -3343 +3380,0 @@
-# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
@@ -3350 +3386,0 @@
-# CONFIG_WIMAX_GDM72XX is not set
@@ -3353,2 +3389 @@
-# CONFIG_LUSTRE_FS is not set
-# CONFIG_DGAP is not set
+# CONFIG_LNET is not set
@@ -3358,0 +3394 @@
+# CONFIG_GOLDFISH is not set
@@ -3372,0 +3409 @@
+# CONFIG_COMMON_CLK_CDCE706 is not set
@@ -3379 +3415,0 @@
-# CONFIG_COMMON_CLK_CDCE706 is not set
@@ -3417,0 +3454 @@
+# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
@@ -3455 +3491,0 @@
-# CONFIG_EXTCON_AXP288 is not set
@@ -3475 +3510,0 @@
-# CONFIG_TS4800_IRQ is not set
@@ -3504 +3539,2 @@
-# CONFIG_NVMEM is not set
+CONFIG_NVMEM=m
+CONFIG_NVMEM_SUNXI_SID=m
@@ -3506,2 +3541,0 @@
-# CONFIG_STM_DUMMY is not set
-# CONFIG_STM_SOURCE_CONSOLE is not set
@@ -3553,0 +3588 @@
+CONFIG_FS_ENCRYPTION=m
@@ -3590,0 +3626 @@
+# CONFIG_FAT_DEFAULT_UTF8 is not set
@@ -3608,0 +3645 @@
+# CONFIG_ORANGEFS_FS is not set
@@ -3654 +3691,3 @@
-# CONFIG_NFSD_PNFS is not set
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
@@ -3763,0 +3803,2 @@
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_DEBUG_PAGE_REF is not set
@@ -3829,0 +3871 @@
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
@@ -3861,0 +3904 @@
+CONFIG_BPF_EVENTS=y
@@ -3887,0 +3931 @@
+# CONFIG_TEST_BITMAP is not set
@@ -3922 +3966 @@
-# CONFIG_ENCRYPTED_KEYS is not set
+CONFIG_ENCRYPTED_KEYS=m
@@ -3959,2 +4002,0 @@
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
@@ -4055 +4096,0 @@
-CONFIG_CRYPTO_ZLIB=m
@@ -4080 +4120,0 @@
-CONFIG_PUBLIC_KEY_ALGO_RSA=m