Espressobin / MVEBU64 family kernel upgrade, patches adjustement, C2 bugfix

2025-09-24 19:47:06 +07:00 · 2018-06-28 18:19:39 +00:00
parent 1eb06f1b4d
commit c16321eb01
25 changed files with 18520 additions and 39199 deletions
--- a/config/kernel/linux-mvebu64-default.config
+++ b/config/kernel/linux-mvebu64-default.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.131 Kernel Configuration
+# Linux/arm64 4.4.138 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -156,6 +156,7 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
--- a/config/kernel/linux-mvebu64-dev.config
+++ b/config/kernel/linux-mvebu64-dev.config
@@ -1,10 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.17.2 Kernel Configuration
+# Linux/arm64 4.18.0-rc1 Kernel Configuration
+#
+
+#
+# Compiler: aarch64-linux-gnu-gcc (Linaro GCC 7.2-2017.11) 7.2.1 20171011
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU=y
 CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_CONT_SHIFT=4
@@ -24,18 +27,16 @@ CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ZONE_DMA32=y
 CONFIG_HAVE_GENERIC_GUP=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_SMP=y
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_MULTI_IRQ_HANDLER=y
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=70201
+CONFIG_CLANG_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -44,7 +45,6 @@ CONFIG_THREAD_INFO_IN_TASK=y
 # General setup
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
@@ -129,6 +129,7 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_SUPPORTS_INT128=y
 # CONFIG_NUMA_BALANCING is not set
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
@@ -249,7 +250,6 @@ CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
-CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
@@ -262,13 +262,12 @@ CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
-CONFIG_HAVE_CC_STACKPROTECTOR=y
-CONFIG_CC_STACKPROTECTOR_NONE=y
-# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
-# CONFIG_CC_STACKPROTECTOR_AUTO is not set
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@@ -284,6 +283,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
@@ -402,8 +402,8 @@ CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_SYSCALL=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
 # CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIE_ECRC is not set
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM_DEFAULT=y
@@ -413,7 +413,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set
-CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_QUIRKS=y
@@ -426,29 +425,33 @@ CONFIG_PCI_ECAM=y
 CONFIG_PCI_LABEL=y
 # CONFIG_HOTPLUG_PCI is not set

+#
+# PCI controller drivers
+#
+CONFIG_PCI_AARDVARK=y
+
 #
 # Cadence PCIe controllers support
 #
 # CONFIG_PCIE_CADENCE_HOST is not set
-
-#
-# DesignWare PCI Core Support
-#
-# CONFIG_PCIE_DW_PLAT is not set
-# CONFIG_PCI_HISI is not set
-# CONFIG_PCIE_ARMADA_8K is not set
-# CONFIG_PCIE_KIRIN is not set
-
-#
-# PCI host controller drivers
-#
-CONFIG_PCI_AARDVARK=y
+# CONFIG_PCI_FTPCI100 is not set
 CONFIG_PCI_HOST_COMMON=y
 CONFIG_PCI_HOST_GENERIC=y
 # CONFIG_PCI_XGENE is not set
 # CONFIG_PCI_HOST_THUNDER_PEM is not set
 # CONFIG_PCI_HOST_THUNDER_ECAM is not set

+#
+# DesignWare PCI Core Support
+#
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+CONFIG_PCIE_DW_PLAT=y
+CONFIG_PCIE_DW_PLAT_HOST=y
+# CONFIG_PCI_HISI is not set
+# CONFIG_PCIE_ARMADA_8K is not set
+# CONFIG_PCIE_KIRIN is not set
+
 #
 # PCI Endpoint
 #
@@ -569,6 +572,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_SECCOMP=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
@@ -580,6 +584,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
+CONFIG_ARM64_SSBD=y
 # CONFIG_ARMV8_DEPRECATED is not set
 # CONFIG_ARM64_SW_TTBR0_PAN is not set

@@ -719,6 +724,7 @@ CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
+# CONFIG_XDP_SOCKETS is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -870,14 +876,12 @@ CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_REDIRECT=m
+CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_OSF=m
 CONFIG_NF_TABLES=m
 # CONFIG_NF_TABLES_INET is not set
 # CONFIG_NF_TABLES_NETDEV is not set
-CONFIG_NFT_EXTHDR=m
-CONFIG_NFT_META=m
-# CONFIG_NFT_RT is not set
 # CONFIG_NFT_NUMGEN is not set
 CONFIG_NFT_CT=m
 CONFIG_NFT_FLOW_OFFLOAD=m
@@ -885,6 +889,7 @@ CONFIG_NFT_FLOW_OFFLOAD=m
 # CONFIG_NFT_SET_HASH is not set
 # CONFIG_NFT_SET_BITMAP is not set
 CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
@@ -896,6 +901,7 @@ CONFIG_NFT_QUEUE=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_SOCKET=m
 # CONFIG_NF_FLOW_TABLE_INET is not set
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1032,6 +1038,7 @@ CONFIG_IP_VS_LBLC=m
 CONFIG_IP_VS_LBLCR=m
 CONFIG_IP_VS_DH=m
 CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m

@@ -1040,6 +1047,11 @@ CONFIG_IP_VS_NQ=m
 #
 CONFIG_IP_VS_SH_TAB_BITS=8

+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
 #
 # IPVS application helper
 #
@@ -1053,6 +1065,7 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
 # CONFIG_NF_TABLES_IPV4 is not set
 # CONFIG_NF_TABLES_ARP is not set
 CONFIG_NF_FLOW_TABLE_IPV4=m
@@ -1061,7 +1074,7 @@ CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_NAT_IPV4=m
-CONFIG_NF_NAT_MASQUERADE_IPV4=m
+CONFIG_NF_NAT_MASQUERADE_IPV4=y
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PPTP=m
@@ -1094,13 +1107,14 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
 # CONFIG_NF_TABLES_IPV6 is not set
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
 CONFIG_NF_NAT_IPV6=m
-CONFIG_NF_NAT_MASQUERADE_IPV6=m
+CONFIG_NF_NAT_MASQUERADE_IPV6=y
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -1149,6 +1163,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
 CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m

@@ -1435,7 +1450,6 @@ CONFIG_BT_6LOWPAN=m
 CONFIG_BT_INTEL=m
 CONFIG_BT_BCM=m
 CONFIG_BT_RTL=m
-CONFIG_BT_QCA=m
 CONFIG_BT_HCIBTUSB=m
 # CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
 CONFIG_BT_HCIBTUSB_BCM=y
@@ -1447,7 +1461,6 @@ CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
-CONFIG_BT_HCIUART_QCA=y
 # CONFIG_BT_HCIUART_AG6XX is not set
 # CONFIG_BT_HCIUART_MRVL is not set
 CONFIG_BT_HCIBCM203X=m
@@ -1562,6 +1575,7 @@ CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 # CONFIG_NET_DEVLINK is not set
 CONFIG_MAY_USE_DEVLINK=y
+CONFIG_FAILOVER=y
 CONFIG_HAVE_EBPF_JIT=y

 #
@@ -1578,9 +1592,13 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_USER_HELPER is not set
 CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
@@ -1612,6 +1630,7 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
 #
 # Bus devices
 #
+CONFIG_ARM_CCI=y
 # CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_SIMPLE_PM_BUS is not set
 CONFIG_VEXPRESS_CONFIG=y
@@ -1739,6 +1758,7 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_BLK_DEV_LOOP=y
@@ -2139,8 +2159,6 @@ CONFIG_NET_VENDOR_ATHEROS=y
 # CONFIG_ATL1C is not set
 # CONFIG_ALX is not set
 # CONFIG_NET_VENDOR_AURORA is not set
-CONFIG_NET_CADENCE=y
-# CONFIG_MACB is not set
 CONFIG_NET_VENDOR_BROADCOM=y
 # CONFIG_B44 is not set
 # CONFIG_BCMGENET is not set
@@ -2152,6 +2170,8 @@ CONFIG_NET_VENDOR_BROADCOM=y
 # CONFIG_BNXT is not set
 CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_BNA is not set
+CONFIG_NET_CADENCE=y
+# CONFIG_MACB is not set
 CONFIG_NET_VENDOR_CAVIUM=y
 # CONFIG_THUNDER_NIC_PF is not set
 # CONFIG_THUNDER_NIC_VF is not set
@@ -2179,9 +2199,6 @@ CONFIG_NET_VENDOR_EMULEX=y
 # CONFIG_BE2NET is not set
 CONFIG_NET_VENDOR_EZCHIP=y
 # CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set
-CONFIG_NET_VENDOR_EXAR=y
-# CONFIG_S2IO is not set
-# CONFIG_VXGE is not set
 CONFIG_NET_VENDOR_HISILICON=y
 # CONFIG_HIX5HD2_GMAC is not set
 # CONFIG_HISI_FEMAC is not set
@@ -2193,6 +2210,8 @@ CONFIG_NET_VENDOR_HISILICON=y
 CONFIG_NET_VENDOR_HP=y
 # CONFIG_HP100 is not set
 CONFIG_NET_VENDOR_HUAWEI=y
+# CONFIG_HINIC is not set
+CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_INTEL=y
 # CONFIG_E100 is not set
 # CONFIG_E1000 is not set
@@ -2209,7 +2228,9 @@ CONFIG_IXGBEVF=y
 # CONFIG_I40EVF is not set
 # CONFIG_ICE is not set
 # CONFIG_FM10K is not set
-CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_EXAR=y
+# CONFIG_S2IO is not set
+# CONFIG_VXGE is not set
 # CONFIG_JME is not set
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=y
@@ -2232,6 +2253,8 @@ CONFIG_NET_VENDOR_MICROCHIP=y
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCX24J600 is not set
 # CONFIG_LAN743X is not set
+CONFIG_NET_VENDOR_MICROSEMI=y
+# CONFIG_MSCC_OCELOT_SWITCH is not set
 CONFIG_NET_VENDOR_MYRI=y
 # CONFIG_MYRI10GE is not set
 # CONFIG_FEALNX is not set
@@ -2260,26 +2283,26 @@ CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_RMNET is not set
+CONFIG_NET_VENDOR_RDC=y
+# CONFIG_R6040 is not set
 CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
 # CONFIG_R8169 is not set
 CONFIG_NET_VENDOR_RENESAS=y
-CONFIG_NET_VENDOR_RDC=y
-# CONFIG_R6040 is not set
 CONFIG_NET_VENDOR_ROCKER=y
 # CONFIG_ROCKER is not set
 CONFIG_NET_VENDOR_SAMSUNG=y
 # CONFIG_SXGBE_ETH is not set
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SOLARFLARE=y
+# CONFIG_SFC is not set
+# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SILAN=y
 # CONFIG_SC92031 is not set
 CONFIG_NET_VENDOR_SIS=y
 # CONFIG_SIS900 is not set
 # CONFIG_SIS190 is not set
-CONFIG_NET_VENDOR_SOLARFLARE=y
-# CONFIG_SFC is not set
-# CONFIG_SFC_FALCON is not set
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=y
 # CONFIG_EPIC100 is not set
@@ -2293,6 +2316,8 @@ CONFIG_NET_VENDOR_SUN=y
 # CONFIG_SUNGEM is not set
 # CONFIG_CASSINI is not set
 # CONFIG_NIU is not set
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
 CONFIG_NET_VENDOR_TEHUTI=y
 # CONFIG_TEHUTI is not set
 CONFIG_NET_VENDOR_TI=y
@@ -2304,8 +2329,6 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_WIZNET=y
 # CONFIG_WIZNET_W5100 is not set
 # CONFIG_WIZNET_W5300 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_NET_SB1000 is not set
@@ -2319,6 +2342,7 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=m
 CONFIG_MDIO_CAVIUM=m
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_MSCC_MIIM is not set
 CONFIG_MDIO_OCTEON=m
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_PHYLINK=y
@@ -2332,6 +2356,7 @@ CONFIG_SWPHY=y
 # CONFIG_SFP is not set
 # CONFIG_AMD_PHY is not set
 # CONFIG_AQUANTIA_PHY is not set
+CONFIG_ASIX_PHY=m
 # CONFIG_AT803X_PHY is not set
 CONFIG_BCM7XXX_PHY=m
 # CONFIG_BCM87XX_PHY is not set
@@ -2341,6 +2366,7 @@ CONFIG_BCM_NET_PHYLIB=m
 # CONFIG_CORTINA_PHY is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DP83822_PHY is not set
+CONFIG_DP83TC811_PHY=m
 # CONFIG_DP83848_PHY is not set
 # CONFIG_DP83867_PHY is not set
 CONFIG_FIXED_PHY=y
@@ -2352,6 +2378,7 @@ CONFIG_MARVELL_PHY=y
 CONFIG_MARVELL_10G_PHY=m
 # CONFIG_MICREL_PHY is not set
 CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
 # CONFIG_MICROSEMI_PHY is not set
 # CONFIG_NATIONAL_PHY is not set
 # CONFIG_QSEMI_PHY is not set
@@ -2468,6 +2495,7 @@ CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
 CONFIG_WIL6210_DEBUGFS=y
 CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
 CONFIG_ATH10K_PCI=m
 # CONFIG_ATH10K_AHB is not set
 CONFIG_ATH10K_SDIO=m
@@ -2675,6 +2703,7 @@ CONFIG_XEN_NETDEV_BACKEND=m
 # CONFIG_VMXNET3 is not set
 CONFIG_FUJITSU_ES=m
 CONFIG_NETDEVSIM=m
+CONFIG_NET_FAILOVER=y
 # CONFIG_ISDN is not set
 CONFIG_NVM=y
 # CONFIG_NVM_DEBUG is not set
@@ -2968,6 +2997,7 @@ CONFIG_I2C_SLAVE_EEPROM=m
 CONFIG_SPI=y
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y

 #
 # SPI Master Controller Drivers
@@ -3033,6 +3063,7 @@ CONFIG_PINCTRL_ARMADA_AP806=y
 CONFIG_PINCTRL_ARMADA_CP110=y
 CONFIG_PINCTRL_ARMADA_37XX=y
 CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
 CONFIG_GPIO_ACPI=y
 CONFIG_GPIOLIB_IRQCHIP=y
@@ -3480,6 +3511,7 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_PV88080 is not set
 # CONFIG_REGULATOR_PV88090 is not set
 CONFIG_REGULATOR_PWM=m
+# CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
@@ -3519,6 +3551,7 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 #
 # AMD Library routines
 #
+# CONFIG_DRM_XEN is not set

 #
 # Frame buffer Devices
@@ -3578,7 +3611,6 @@ CONFIG_XEN_FBDEV_FRONTEND=m
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_AUO_K190X is not set
 # CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_SM712 is not set
@@ -3597,6 +3629,7 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_AMS369FG06 is not set
 # CONFIG_LCD_LMS501KF03 is not set
 # CONFIG_LCD_HX8357 is not set
+# CONFIG_LCD_OTM3225A is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=y
 CONFIG_BACKLIGHT_PWM=m
@@ -3685,6 +3718,7 @@ CONFIG_HID_LOGITECH=y
 # CONFIG_LOGIWHEELS_FF is not set
 # CONFIG_HID_MAGICMOUSE is not set
 # CONFIG_HID_MAYFLASH is not set
+# CONFIG_HID_REDRAGON is not set
 CONFIG_HID_MICROSOFT=y
 CONFIG_HID_MONTEREY=y
 # CONFIG_HID_MULTITOUCH is not set
@@ -3703,6 +3737,7 @@ CONFIG_HID_RETRODE=m
 # CONFIG_HID_SAMSUNG is not set
 # CONFIG_HID_SONY is not set
 # CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_STEAM is not set
 # CONFIG_HID_STEELSERIES is not set
 # CONFIG_HID_SUNPLUS is not set
 # CONFIG_HID_RMI is not set
@@ -3981,6 +4016,7 @@ CONFIG_LEDS_CLASS=y
 #
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
+CONFIG_LEDS_CR0014114=m
 # CONFIG_LEDS_LM3530 is not set
 # CONFIG_LEDS_LM3642 is not set
 CONFIG_LEDS_LM3692X=m
@@ -4236,9 +4272,6 @@ CONFIG_XEN_PRIVCMD=m
 CONFIG_XEN_EFI=y
 CONFIG_XEN_AUTO_XLATE=y
 CONFIG_STAGING=y
-CONFIG_IPX=m
-CONFIG_IPX_INTERN=y
-# CONFIG_NCP_FS is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_COMEDI is not set
 # CONFIG_RTL8192U is not set
@@ -4267,7 +4300,6 @@ CONFIG_VT6656=m
 # CONFIG_LTE_GDM724X is not set
 CONFIG_MTD_SPINAND_MT29F=y
 CONFIG_MTD_SPINAND_ONDIEECC=y
-# CONFIG_LNET is not set
 # CONFIG_DGNC is not set
 # CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
@@ -4283,6 +4315,7 @@ CONFIG_MTD_SPINAND_ONDIEECC=y
 # USB Power Delivery and Type-C drivers
 #
 CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_RT1711H=m
 # CONFIG_PI433 is not set
 # CONFIG_MTK_MMC is not set
 # CONFIG_GOLDFISH is not set
@@ -4450,6 +4483,7 @@ CONFIG_PHY_XGENE=y
 #
 # Performance monitor support
 #
+CONFIG_ARM_CCI_PMU=m
 # CONFIG_ARM_CCI400_PMU is not set
 # CONFIG_ARM_CCI5xx_PMU is not set
 # CONFIG_ARM_CCN is not set
@@ -4557,6 +4591,7 @@ CONFIG_HAVE_ACPI_APEI=y
 # CONFIG_ACPI_CONFIGFS is not set
 CONFIG_ACPI_IORT=y
 CONFIG_ACPI_GTDT=y
+CONFIG_ACPI_PPTT=y

 #
 # File systems
@@ -4610,6 +4645,7 @@ CONFIG_PRINT_QUOTA_WARNING=y
 # CONFIG_QFMT_V2 is not set
 CONFIG_QUOTACTL=y
 CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_OVERLAY_FS=m
@@ -4646,6 +4682,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_PROC_FS=y
 # CONFIG_PROC_KCORE is not set
 CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
 CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_CHILDREN=y
@@ -4656,6 +4693,7 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=y
@@ -4699,23 +4737,6 @@ CONFIG_UBIFS_FS_SECURITY=y
 # CONFIG_UFS_FS is not set
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
-CONFIG_AUFS_FS=m
-CONFIG_AUFS_BRANCH_MAX_127=y
-# CONFIG_AUFS_BRANCH_MAX_511 is not set
-# CONFIG_AUFS_BRANCH_MAX_1023 is not set
-# CONFIG_AUFS_BRANCH_MAX_32767 is not set
-CONFIG_AUFS_SBILIST=y
-# CONFIG_AUFS_HNOTIFY is not set
-# CONFIG_AUFS_EXPORT is not set
-# CONFIG_AUFS_XATTR is not set
-# CONFIG_AUFS_FHSM is not set
-# CONFIG_AUFS_RDU is not set
-# CONFIG_AUFS_DIRREN is not set
-# CONFIG_AUFS_SHWH is not set
-# CONFIG_AUFS_BR_RAMFS is not set
-# CONFIG_AUFS_BR_FUSE is not set
-CONFIG_AUFS_BDEV_LOOP=y
-# CONFIG_AUFS_DEBUG is not set
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
@@ -4811,6 +4832,7 @@ CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_KVM_COMPAT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
@@ -4878,6 +4900,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HAVE_ARCH_KASAN=y
 # CONFIG_KASAN is not set
 CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
 # CONFIG_DEBUG_SHIRQ is not set

@@ -4965,6 +4988,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_UUID is not set
+# CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_LKM is not set
@@ -5083,6 +5107,11 @@ CONFIG_CRYPTO_ENGINE=m
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=m
 # CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_AEGIS128L=m
+CONFIG_CRYPTO_AEGIS256=m
+CONFIG_CRYPTO_MORUS640=m
+CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_SEQIV=m
 CONFIG_CRYPTO_ECHAINIV=m

@@ -5148,7 +5177,7 @@ CONFIG_CRYPTO_FCRYPT=m
 # CONFIG_CRYPTO_CHACHA20 is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SM4 is not set
+CONFIG_CRYPTO_SM4=m
 CONFIG_CRYPTO_SPECK=m
 # CONFIG_CRYPTO_TEA is not set
 # CONFIG_CRYPTO_TWOFISH is not set
@@ -5161,6 +5190,7 @@ CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_842 is not set
 CONFIG_CRYPTO_LZ4=m
 # CONFIG_CRYPTO_LZ4HC is not set
+CONFIG_CRYPTO_ZSTD=m

 #
 # Random Number Generation
@@ -5209,6 +5239,7 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y
 # CONFIG_CRYPTO_SHA512_ARM64_CE is not set
 # CONFIG_CRYPTO_SHA3_ARM64 is not set
 # CONFIG_CRYPTO_SM3_ARM64_CE is not set
+CONFIG_CRYPTO_SM4_ARM64_CE=m
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 # CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set
 # CONFIG_CRYPTO_CRC32_ARM64_CE is not set
@@ -5233,6 +5264,7 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 # CONFIG_INDIRECT_PIO is not set
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
@@ -5287,7 +5319,11 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
 CONFIG_SGL_ALLOC=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DIRECT_OPS=y
+CONFIG_SWIOTLB=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
--- a/config/kernel/linux-mvebu64-next.config
+++ b/config/kernel/linux-mvebu64-next.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.16.17 Kernel Configuration
+# Linux/arm64 4.17.3 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -35,6 +35,7 @@ CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_MULTI_IRQ_HANDLER=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -203,7 +204,6 @@ CONFIG_MEMBARRIER=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
-# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_BPF_SYSCALL=y
 # CONFIG_BPF_JIT_ALWAYS_ON is not set
@@ -236,8 +236,6 @@ CONFIG_KEXEC_CORE=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
-# CONFIG_UPROBES is not set
-# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
@@ -271,28 +269,23 @@ CONFIG_CC_STACKPROTECTOR_NONE=y
 # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
 # CONFIG_CC_STACKPROTECTOR_STRONG is not set
 # CONFIG_CC_STACKPROTECTOR_AUTO is not set
-CONFIG_THIN_ARCHIVES=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_ARCH_MMAP_RND_BITS=18
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
-# CONFIG_HAVE_ARCH_HASH is not set
-# CONFIG_ISA_BUS_API is not set
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
-# CONFIG_CPU_NO_EFFICIENT_FFS is not set
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
-# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
-# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
@@ -396,7 +389,6 @@ CONFIG_ARCH_MVEBU=y
 # CONFIG_ARCH_THUNDER2 is not set
 # CONFIG_ARCH_UNIPHIER is not set
 # CONFIG_ARCH_VEXPRESS is not set
-# CONFIG_ARCH_VULCAN is not set
 # CONFIG_ARCH_XGENE is not set
 # CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQMP is not set
@@ -545,7 +537,6 @@ CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_NO_BOOTMEM=y
 CONFIG_MEMORY_ISOLATION=y
-# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
@@ -560,7 +551,6 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 # CONFIG_CLEANCACHE is not set
 # CONFIG_FRONTSWAP is not set
@@ -589,6 +579,7 @@ CONFIG_XEN=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
+CONFIG_HARDEN_EL2_VECTORS=y
 # CONFIG_ARMV8_DEPRECATED is not set
 # CONFIG_ARM64_SW_TTBR0_PAN is not set

@@ -607,7 +598,7 @@ CONFIG_ARM64_UAO=y
 # CONFIG_ARM64_PMEM is not set
 CONFIG_ARM64_RAS_EXTN=y
 CONFIG_ARM64_SVE=y
-CONFIG_ARM64_MODULE_CMODEL_LARGE=y
+CONFIG_ARM64_MODULE_PLTS=y
 # CONFIG_RANDOMIZE_BASE is not set

 #
@@ -628,7 +619,6 @@ CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ELFCORE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_SCRIPT=y
-# CONFIG_HAVE_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
 CONFIG_COREDUMP=y
 CONFIG_COMPAT=y
@@ -676,7 +666,6 @@ CONFIG_DT_IDLE_STATES=y
 # ARM CPU Idle Drivers
 #
 CONFIG_ARM_CPUIDLE=y
-# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set

 #
 # CPU Frequency scaling
@@ -707,7 +696,6 @@ CONFIG_ACPI_CPPC_CPUFREQ=y
 CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
 CONFIG_ARM_DT_BL_CPUFREQ=y
-# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 # CONFIG_QORIQ_CPUFREQ is not set
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
@@ -748,6 +736,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IP_TUNNEL=m
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
 CONFIG_IP_MROUTE=y
 CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IP_PIMSM_V1=y
@@ -884,8 +873,8 @@ CONFIG_NF_NAT_TFTP=m
 CONFIG_NF_NAT_REDIRECT=m
 CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NF_TABLES=m
-CONFIG_NF_TABLES_INET=m
-CONFIG_NF_TABLES_NETDEV=m
+# CONFIG_NF_TABLES_INET is not set
+# CONFIG_NF_TABLES_NETDEV is not set
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
 # CONFIG_NFT_RT is not set
@@ -905,15 +894,8 @@ CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
 # CONFIG_NFT_QUOTA is not set
 CONFIG_NFT_REJECT=m
-CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
-CONFIG_NFT_FIB=m
-CONFIG_NFT_FIB_INET=m
-# CONFIG_NF_DUP_NETDEV is not set
-# CONFIG_NFT_DUP_NETDEV is not set
-# CONFIG_NFT_FWD_NETDEV is not set
-CONFIG_NFT_FIB_NETDEV=m
 # CONFIG_NF_FLOW_TABLE_INET is not set
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -1071,22 +1053,15 @@ CONFIG_IP_VS_PE_SIP=m
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_SOCKET_IPV4=m
-CONFIG_NF_TABLES_IPV4=m
-CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NFT_REJECT_IPV4=m
-CONFIG_NFT_DUP_IPV4=m
-CONFIG_NFT_FIB_IPV4=m
-CONFIG_NF_TABLES_ARP=m
+# CONFIG_NF_TABLES_IPV4 is not set
+# CONFIG_NF_TABLES_ARP is not set
 CONFIG_NF_FLOW_TABLE_IPV4=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_NAT_IPV4=m
-CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NF_NAT_MASQUERADE_IPV4=m
-CONFIG_NFT_MASQ_IPV4=m
-CONFIG_NFT_REDIR_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NF_NAT_PPTP=m
@@ -1119,14 +1094,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_SOCKET_IPV6=m
-CONFIG_NF_TABLES_IPV6=m
-CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
-CONFIG_NFT_REJECT_IPV6=m
-CONFIG_NFT_DUP_IPV6=m
-CONFIG_NFT_FIB_IPV6=m
+# CONFIG_NF_TABLES_IPV6 is not set
 CONFIG_NF_FLOW_TABLE_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
@@ -1159,10 +1127,7 @@ CONFIG_IP6_NF_TARGET_NPT=m
 # DECnet: Netfilter Configuration
 #
 CONFIG_DECNET_NF_GRABULATOR=m
-CONFIG_NF_TABLES_BRIDGE=m
-CONFIG_NFT_BRIDGE_META=m
-CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
+# CONFIG_NF_TABLES_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
 CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -1212,6 +1177,7 @@ CONFIG_RDS_TCP=m
 # CONFIG_RDS_DEBUG is not set
 CONFIG_TIPC=m
 CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_DIAG=m
 CONFIG_ATM=m
 CONFIG_ATM_CLIP=m
 CONFIG_ATM_CLIP_NO_ICMP=y
@@ -1332,6 +1298,7 @@ CONFIG_NET_EMATCH_META=m
 CONFIG_NET_EMATCH_TEXT=m
 CONFIG_NET_EMATCH_CANID=m
 CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
@@ -1490,13 +1457,13 @@ CONFIG_BT_HCIVHCI=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
+CONFIG_BT_HCIRSI=m
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_IPV6 is not set
 # CONFIG_AF_RXRPC_INJECT_LOSS is not set
 # CONFIG_AF_RXRPC_DEBUG is not set
 # CONFIG_RXKAD is not set
 # CONFIG_AF_KCM is not set
-# CONFIG_STREAM_PARSER is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@@ -1622,7 +1589,6 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_SYS_HYPERVISOR=y
-# CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
@@ -1646,9 +1612,6 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
 #
 # Bus devices
 #
-# CONFIG_ARM_CCI400_PMU is not set
-# CONFIG_ARM_CCI5xx_PMU is not set
-# CONFIG_ARM_CCN is not set
 # CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_SIMPLE_PM_BUS is not set
 CONFIG_VEXPRESS_CONFIG=y
@@ -1688,13 +1651,8 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
 CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
@@ -1723,25 +1681,22 @@ CONFIG_MTD_M25P80=y
 # Disk-On-Chip Device Drivers
 #
 # CONFIG_MTD_DOCG3 is not set
+# CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_NAND_ECC=y
 # CONFIG_MTD_NAND_ECC_SMC is not set
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_ECC_BCH is not set
-# CONFIG_MTD_SM_COMMON is not set
 # CONFIG_MTD_NAND_DENALI_PCI is not set
 # CONFIG_MTD_NAND_DENALI_DT is not set
 # CONFIG_MTD_NAND_GPIO is not set
-# CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
 # CONFIG_MTD_NAND_RICOH is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_DOCG4 is not set
 # CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_PXA3xx is not set
 CONFIG_MTD_NAND_MARVELL=m
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_BRCMNAND is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_ONENAND is not set

 #
 # LPDDR & LPDDR2 PCM memory drivers
@@ -1786,7 +1741,6 @@ CONFIG_ZRAM=m
 # CONFIG_ZRAM_WRITEBACK is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -1818,7 +1772,6 @@ CONFIG_BLK_DEV_NVME=y
 #
 # Misc devices
 #
-# CONFIG_SENSORS_LIS3LV02D is not set
 # CONFIG_AD525X_DPOT is not set
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_PHANTOM is not set
@@ -1899,10 +1852,6 @@ CONFIG_EEPROM_93CX6=m
 #
 # CONFIG_GENWQE is not set
 # CONFIG_ECHO is not set
-# CONFIG_CXL_BASE is not set
-# CONFIG_CXL_AFU_DRIVER_OPS is not set
-# CONFIG_CXL_LIB is not set
-# CONFIG_OCXL_BASE is not set
 CONFIG_MISC_RTSX_PCI=m
 # CONFIG_MISC_RTSX_USB is not set

@@ -1913,7 +1862,6 @@ CONFIG_SCSI_MOD=y
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_NETLINK is not set
 # CONFIG_SCSI_MQ_DEFAULT is not set
 # CONFIG_SCSI_PROC_FS is not set

@@ -1976,7 +1924,6 @@ CONFIG_SCSI_MVUMI=m
 CONFIG_XEN_SCSI_FRONTEND=m
 # CONFIG_SCSI_SNIC is not set
 # CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INITIO is not set
 # CONFIG_SCSI_INIA100 is not set
@@ -2000,7 +1947,6 @@ CONFIG_SCSI_OSD_DPRINT_SENSE=1
 # CONFIG_SCSI_OSD_DEBUG is not set
 CONFIG_HAVE_PATA_PLATFORM=y
 CONFIG_ATA=y
-# CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_ATA_VERBOSE_ERROR is not set
 CONFIG_ATA_ACPI=y
 # CONFIG_SATA_ZPODD is not set
@@ -2125,8 +2071,6 @@ CONFIG_GENEVE=m
 # CONFIG_GTP is not set
 # CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
 CONFIG_TUN=y
 CONFIG_TAP=y
 # CONFIG_TUN_VNET_CROSS_LE is not set
@@ -2162,6 +2106,7 @@ CONFIG_NET_DSA_MT7530=m
 # CONFIG_MICROCHIP_KSZ is not set
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
+# CONFIG_NET_DSA_MV88E6XXX_PTP is not set
 # CONFIG_NET_DSA_QCA8K is not set
 CONFIG_NET_DSA_SMSC_LAN9303=m
 CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
@@ -2185,7 +2130,6 @@ CONFIG_NET_VENDOR_AMD=y
 # CONFIG_AMD8111_ETH is not set
 # CONFIG_PCNET32 is not set
 # CONFIG_AMD_XGBE is not set
-# CONFIG_AMD_XGBE_HAVE_ECC is not set
 CONFIG_NET_VENDOR_AQUANTIA=y
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
@@ -2263,6 +2207,7 @@ CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBEVF=y
 # CONFIG_I40E is not set
 # CONFIG_I40EVF is not set
+CONFIG_ICE=m
 # CONFIG_FM10K is not set
 CONFIG_NET_VENDOR_I825XX=y
 # CONFIG_JME is not set
@@ -2275,7 +2220,6 @@ CONFIG_SKY2=y
 # CONFIG_SKY2_DEBUG is not set
 CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_MLX4_EN is not set
-# CONFIG_MLX4_CORE is not set
 # CONFIG_MLX5_CORE is not set
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
@@ -2287,6 +2231,7 @@ CONFIG_NET_VENDOR_MICREL=y
 CONFIG_NET_VENDOR_MICROCHIP=y
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCX24J600 is not set
+CONFIG_LAN743X=m
 CONFIG_NET_VENDOR_MYRI=y
 # CONFIG_MYRI10GE is not set
 # CONFIG_FEALNX is not set
@@ -2295,6 +2240,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
 # CONFIG_NS83820 is not set
 CONFIG_NET_VENDOR_NETRONOME=y
 # CONFIG_NFP is not set
+CONFIG_NET_VENDOR_NI=y
 CONFIG_NET_VENDOR_8390=y
 # CONFIG_NE2K_PCI is not set
 CONFIG_NET_VENDOR_NVIDIA=y
@@ -2338,7 +2284,6 @@ CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=y
 # CONFIG_EPIC100 is not set
 CONFIG_SMSC911X=y
-# CONFIG_SMSC911X_ARCH_HOOKS is not set
 # CONFIG_SMSC9420 is not set
 CONFIG_NET_VENDOR_SOCIONEXT=y
 CONFIG_NET_VENDOR_STMICRO=y
@@ -2693,6 +2638,7 @@ CONFIG_RSI_91X=m
 # CONFIG_RSI_DEBUGFS is not set
 CONFIG_RSI_SDIO=m
 CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
 CONFIG_WLAN_VENDOR_ST=y
 CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m
@@ -2920,7 +2866,6 @@ CONFIG_HW_RANDOM_CAVIUM=y
 # PCMCIA character devices
 #
 # CONFIG_RAW_DRIVER is not set
-# CONFIG_HPET is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
@@ -2997,7 +2942,6 @@ CONFIG_I2C_NOMADIK=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
 # CONFIG_I2C_PXA is not set
-# CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_RK3X=m
 CONFIG_I2C_SIMTEC=m
 # CONFIG_I2C_THUNDERX is not set
@@ -3040,7 +2984,6 @@ CONFIG_SPI_ARMADA_3700=y
 CONFIG_SPI_ORION=y
 CONFIG_SPI_PL022=y
 # CONFIG_SPI_PXA2XX is not set
-# CONFIG_SPI_PXA2XX_PCI is not set
 # CONFIG_SPI_ROCKCHIP is not set
 # CONFIG_SPI_SC18IS602 is not set
 # CONFIG_SPI_THUNDERX is not set
@@ -3108,6 +3051,7 @@ CONFIG_GPIO_AMDPT=m
 # CONFIG_GPIO_FTGPIO010 is not set
 CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_GRGPIO is not set
+CONFIG_GPIO_HLWD=m
 CONFIG_GPIO_MB86S7X=m
 # CONFIG_GPIO_MOCKUP is not set
 CONFIG_GPIO_MVEBU=y
@@ -3356,6 +3300,7 @@ CONFIG_SENSORS_XGENE=m
 #
 CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_THERMAL=y
+# CONFIG_THERMAL_STATISTICS is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
@@ -3493,7 +3438,6 @@ CONFIG_MFD_TI_LP87565=m
 # CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_MFD_LM3533 is not set
 # CONFIG_MFD_TC3589X is not set
-# CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_VX855 is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA_SPI is not set
@@ -3508,6 +3452,7 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+CONFIG_REGULATOR_88PG86X=m
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_ANATOP is not set
@@ -3556,6 +3501,7 @@ CONFIG_IR_SANYO_DECODER=y
 CONFIG_IR_SHARP_DECODER=y
 CONFIG_IR_MCE_KBD_DECODER=y
 CONFIG_IR_XMP_DECODER=y
+CONFIG_IR_IMON_DECODER=m
 # CONFIG_RC_DEVICES is not set
 # CONFIG_MEDIA_SUPPORT is not set

@@ -3573,8 +3519,6 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 #
 # AMD Library routines
 #
-# CONFIG_CHASH is not set
-# CONFIG_DRM_LIB_RANDOM is not set

 #
 # Frame buffer Devices
@@ -3583,22 +3527,15 @@ CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set

@@ -3673,7 +3610,6 @@ CONFIG_BACKLIGHT_LP855X=m
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_ARCXCNN is not set
-# CONFIG_VGASTATE is not set
 CONFIG_VIDEOMODE_HELPERS=y

 #
@@ -3719,12 +3655,14 @@ CONFIG_HID_CHICONY=y
 CONFIG_HID_CYPRESS=y
 # CONFIG_HID_DRAGONRISE is not set
 # CONFIG_HID_EMS_FF is not set
+CONFIG_HID_ELAN=m
 # CONFIG_HID_ELECOM is not set
 # CONFIG_HID_ELO is not set
 CONFIG_HID_EZKEY=y
 # CONFIG_HID_GEMBIRD is not set
 # CONFIG_HID_GFRM is not set
 # CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_GOOGLE_HAMMER is not set
 # CONFIG_HID_GT683R is not set
 # CONFIG_HID_KEYTOUCH is not set
 # CONFIG_HID_KYE is not set
@@ -3831,7 +3769,6 @@ CONFIG_USB_EHCI_HCD_ORION=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1362_HCD is not set
 # CONFIG_USB_FOTG210_HCD is not set
 # CONFIG_USB_MAX3421_HCD is not set
 CONFIG_USB_OHCI_HCD=y
@@ -3987,8 +3924,14 @@ CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_FUSB302=m
 # CONFIG_TYPEC_UCSI is not set
 # CONFIG_TYPEC_TPS6598X is not set
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+# CONFIG_TYPEC_MUX_PI3USB30532 is not set
 # CONFIG_USB_LED_TRIG is not set
 # CONFIG_USB_ULPI_BUS is not set
+CONFIG_USB_ROLE_SWITCH=m
 # CONFIG_UWB is not set
 CONFIG_MMC=y
 CONFIG_PWRSEQ_EMMC=y
@@ -4068,6 +4011,7 @@ CONFIG_LEDS_PWM=m
 #
 # CONFIG_LEDS_BLINKM is not set
 CONFIG_LEDS_SYSCON=y
+CONFIG_LEDS_MLXREG=m
 # CONFIG_LEDS_USER is not set

 #
@@ -4127,6 +4071,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_ISL12022 is not set
+CONFIG_RTC_DRV_ISL12026=m
 # CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8523 is not set
 # CONFIG_RTC_DRV_PCF85063 is not set
@@ -4213,11 +4158,13 @@ CONFIG_DMADEVICES=y
 #
 CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_ACPI=y
 CONFIG_DMA_OF=y
 # CONFIG_ALTERA_MSGDMA is not set
 # CONFIG_AMBA_PL08X is not set
 CONFIG_BCM_SBA_RAID=m
+CONFIG_DW_AXI_DMAC=m
 # CONFIG_FSL_EDMA is not set
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_MV_XOR=y
@@ -4269,7 +4216,6 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 #
 # Microsoft Hyper-V guest support
 #
-# CONFIG_HYPERV_TSCPAGE is not set

 #
 # Xen driver support
@@ -4291,57 +4237,6 @@ CONFIG_XEN_PRIVCMD=m
 CONFIG_XEN_EFI=y
 CONFIG_XEN_AUTO_XLATE=y
 CONFIG_STAGING=y
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_MCS_FIR=m
 CONFIG_IPX=m
 CONFIG_IPX_INTERN=y
 # CONFIG_NCP_FS is not set
@@ -4384,13 +4279,15 @@ CONFIG_MTD_SPINAND_ONDIEECC=y
 # CONFIG_MOST is not set
 # CONFIG_KS7010 is not set
 # CONFIG_GREYBUS is not set
-CONFIG_CRYPTO_DEV_CCREE=m

 #
 # USB Power Delivery and Type-C drivers
 #
 CONFIG_TYPEC_TCPCI=m
 # CONFIG_PI433 is not set
+CONFIG_MTK_MMC=m
+# CONFIG_MTK_AEE_KDUMP is not set
+# CONFIG_MTK_MMC_CD_POLL is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
 CONFIG_CLKDEV_LOOKUP=y
@@ -4407,16 +4304,14 @@ CONFIG_CLK_VEXPRESS_OSC=y
 # CONFIG_COMMON_CLK_SCPI is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_SI514 is not set
+CONFIG_COMMON_CLK_SI544=m
 # CONFIG_COMMON_CLK_SI570 is not set
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
 # CONFIG_CLK_QORIQ is not set
 CONFIG_COMMON_CLK_XGENE=y
-# CONFIG_COMMON_CLK_NXP is not set
 CONFIG_COMMON_CLK_PWM=m
-# CONFIG_COMMON_CLK_PXA is not set
-# CONFIG_COMMON_CLK_PIC32 is not set
 # CONFIG_COMMON_CLK_VC5 is not set
 CONFIG_ARMADA_37XX_CLK=y
 CONFIG_ARMADA_AP806_SYSCON=y
@@ -4437,11 +4332,6 @@ CONFIG_FSL_ERRATUM_A008585=y
 CONFIG_HISILICON_ERRATUM_161010101=y
 CONFIG_ARM64_ERRATUM_858921=y
 # CONFIG_ARM_TIMER_SP804 is not set
-# CONFIG_ATMEL_PIT is not set
-# CONFIG_SH_TIMER_CMT is not set
-# CONFIG_SH_TIMER_MTU2 is not set
-# CONFIG_SH_TIMER_TMU is not set
-# CONFIG_EM_TIMER_STI is not set
 CONFIG_CLKSRC_VERSATILE=y
 CONFIG_MAILBOX=y
 CONFIG_ARM_MHU=m
@@ -4501,7 +4391,6 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=m
 #
 # Qualcomm SoC drivers
 #
-# CONFIG_SUNXI_SRAM is not set
 # CONFIG_SOC_TI is not set

 #
@@ -4545,19 +4434,7 @@ CONFIG_MVEBU_PIC=y
 CONFIG_PARTITION_PERCPU=y
 # CONFIG_IPACK_BUS is not set
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_ATH79 is not set
-# CONFIG_RESET_AXS10X is not set
-# CONFIG_RESET_BERLIN is not set
-# CONFIG_RESET_IMX7 is not set
-# CONFIG_RESET_LANTIQ is not set
-# CONFIG_RESET_LPC18XX is not set
-# CONFIG_RESET_MESON is not set
-# CONFIG_RESET_PISTACHIO is not set
-# CONFIG_RESET_SIMPLE is not set
-# CONFIG_RESET_SUNXI is not set
 # CONFIG_RESET_TI_SYSCON is not set
-# CONFIG_RESET_ZYNQ is not set
-# CONFIG_RESET_TEGRA_BPMP is not set
 # CONFIG_FMC is not set

 #
@@ -4569,12 +4446,16 @@ CONFIG_PHY_XGENE=y
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
+CONFIG_PHY_MAPPHONE_MDM6600=m
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set

 #
 # Performance monitor support
 #
+# CONFIG_ARM_CCI400_PMU is not set
+# CONFIG_ARM_CCI5xx_PMU is not set
+# CONFIG_ARM_CCN is not set
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PMU_ACPI=y
 # CONFIG_ARM_DSU_PMU is not set
@@ -4590,6 +4471,10 @@ CONFIG_RAS=y
 CONFIG_DAX=y
 # CONFIG_DEV_DAX is not set
 CONFIG_NVMEM=y
+
+#
+# HW tracing support
+#
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
 # CONFIG_FPGA is not set
@@ -4617,6 +4502,7 @@ CONFIG_PM_OPP=y
 #
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
+# CONFIG_ARM_SCMI_PROTOCOL is not set
 CONFIG_ARM_SCPI_PROTOCOL=m
 CONFIG_ARM_SCPI_POWER_DOMAIN=m
 # CONFIG_ARM_SDE_INTERFACE is not set
@@ -4638,8 +4524,6 @@ CONFIG_EFI_ARMSTUB=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_TEST is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_EFI_DEV_PATH_PARSER is not set
-# CONFIG_MESON_SM is not set

 #
 # Tegra firmware driver
@@ -4652,6 +4536,7 @@ CONFIG_ACPI_SPCR_TABLE=y
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_BUTTON=y
 CONFIG_ACPI_FAN=y
+# CONFIG_ACPI_TAD is not set
 # CONFIG_ACPI_DOCK is not set
 CONFIG_ACPI_PROCESSOR_IDLE=y
 CONFIG_ACPI_MCFG=y
@@ -4660,7 +4545,6 @@ CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_NUMA=y
-# CONFIG_ACPI_CUSTOM_DSDT is not set
 CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_DEBUG is not set
@@ -4735,6 +4619,7 @@ CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 # CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_XINO_AUTO is not set

 #
 # Caches
@@ -4795,9 +4680,7 @@ CONFIG_JFFS2_FS_WRITEBUFFER=y
 # CONFIG_JFFS2_FS_XATTR is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
 CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
 CONFIG_UBIFS_FS=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
@@ -4935,6 +4818,7 @@ CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
 CONFIG_KVM_ARM_PMU=y
+CONFIG_KVM_INDIRECT_VECTORS=y
 CONFIG_VHOST_NET=y
 # CONFIG_VHOST_VSOCK is not set
 CONFIG_VHOST=y
@@ -5022,13 +4906,15 @@ CONFIG_SCHED_INFO=y
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
 # CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
@@ -5047,8 +4933,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 #
 # RCU Debugging
 #
-# CONFIG_PROVE_RCU is not set
-# CONFIG_TORTURE_TEST is not set
 # CONFIG_RCU_PERF_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
@@ -5101,11 +4985,9 @@ CONFIG_MEMTEST=y
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
 # CONFIG_UBSAN is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 # CONFIG_STRICT_DEVMEM is not set
-# CONFIG_ARM64_PTDUMP_CORE is not set
 # CONFIG_ARM64_PTDUMP_DEBUGFS is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
 # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
@@ -5133,7 +5015,6 @@ CONFIG_KEYS_COMPAT=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 is not set
 # CONFIG_SECURITY_NETWORK is not set
 # CONFIG_SECURITY_PATH is not set
@@ -5212,6 +5093,7 @@ CONFIG_CRYPTO_ECHAINIV=m
 # Block modes
 #
 CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTR=m
 # CONFIG_CRYPTO_CTS is not set
 CONFIG_CRYPTO_ECB=m
@@ -5269,6 +5151,8 @@ CONFIG_CRYPTO_FCRYPT=m
 # CONFIG_CRYPTO_CHACHA20 is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_SPECK=m
 # CONFIG_CRYPTO_TEA is not set
 # CONFIG_CRYPTO_TWOFISH is not set

@@ -5298,13 +5182,13 @@ CONFIG_CRYPTO_JITTERENTROPY=m
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
-# CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
 # CONFIG_CRYPTO_DEV_CCP is not set
 CONFIG_CRYPTO_DEV_NITROX=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
+CONFIG_CRYPTO_DEV_CCREE=m
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
@@ -5338,7 +5222,7 @@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
 # CONFIG_CRYPTO_CHACHA20_NEON is not set
 # CONFIG_CRYPTO_AES_ARM64_BS is not set
-# CONFIG_BINARY_PRINTF is not set
+CONFIG_CRYPTO_SPECK_NEON=m

 #
 # Library routines
@@ -5352,6 +5236,7 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+# CONFIG_INDIRECT_PIO is not set
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
@@ -5406,7 +5291,6 @@ CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
 CONFIG_SGL_ALLOC=y
 CONFIG_DMA_DIRECT_OPS=y
-# CONFIG_DMA_VIRT_OPS is not set
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
@@ -5424,7 +5308,6 @@ CONFIG_FONT_SUPPORT=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-# CONFIG_SG_SPLIT is not set
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_SBITMAP=y
--- a/config/sources/mvebu64.conf
+++ b/config/sources/mvebu64.conf
@@ -29,7 +29,7 @@ case $BRANCH in

 	next)
 	KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
-	KERNELBRANCH='branch:linux-4.16.y'
+	KERNELBRANCH='branch:linux-4.17.y'
 	KERNELDIR=$MAINLINE_KERNEL_DIR

 	KERNEL_USE_GCC='> 7.0'
@@ -37,7 +37,7 @@ case $BRANCH in

 	dev)
 	KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
-	KERNELBRANCH='branch:linux-4.17.y'
+	KERNELBRANCH='branch:master'
 	KERNELDIR=$MAINLINE_KERNEL_DIR

 	KERNEL_USE_GCC='> 7.0'
--- a/lib/configuration.sh
+++ b/lib/configuration.sh
@@ -10,7 +10,7 @@
 # common options
 # daily beta build contains date in subrevision
 if [[ $BETA == yes && -z $SUBREVISION ]]; then SUBREVISION="."$(date --date="tomorrow" +"%y%m%d"); fi
-REVISION="5.49$SUBREVISION" # all boards have same revision
+REVISION="5.50$SUBREVISION" # all boards have same revision
 ROOTPWD="1234" # Must be changed @first login
 MAINTAINER="Igor Pecovnik" # deb signature
 MAINTAINERMAIL="igor.pecovnik@****l.com" # deb signature
--- a/patch/kernel/meson64-dev/general-packaging-for-meson64.patch
+++ b/patch/kernel/meson64-dev/general-packaging-for-meson64.patch
@@ -2,11 +2,12 @@ diff --git a/scripts/package/builddeb b/scripts/package/builddeb
 index 033b55a76..d916f36ac
 --- a/scripts/package/builddeb
 +++ b/scripts/package/builddeb
-@@ -206,7 +206,8 @@ if [ "\$(grep nand /proc/partitions)" != "" ] && [ "\$(grep mmc /proc/partitions
+@@ -206,7 +206,9 @@ if [ "\$(grep nand /proc/partitions)" != "" ] && [ "\$(grep mmc /proc/partitions
 	cp /tmp/uImage /boot/uImage
 	rm -f /$installed_image_path
 else
 -	ln -sf $(basename $installed_image_path) /boot/$image_name || mv /$installed_image_path /boot/$image_name
+	ln -sf $(basename $installed_image_path) /boot/$image_name || mv /$installed_image_path /boot/$image_name
 +	ln -sf $(basename $installed_image_path) /boot/Image || mv /$installed_image_path /boot/Image
 +	mkimage -A arm64 -O linux -T kernel -C none -a 0x1080000 -e 0x1080000 -n "Linux kernel" -d /boot/$(basename $installed_image_path) /boot/uImage
 fi
--- a/patch/kernel/meson64-next/general-packaging-for-meson64.patch
+++ b/patch/kernel/meson64-next/general-packaging-for-meson64.patch
@@ -2,11 +2,12 @@ diff --git a/scripts/package/builddeb b/scripts/package/builddeb
 index 033b55a76..d916f36ac
 --- a/scripts/package/builddeb
 +++ b/scripts/package/builddeb
-@@ -206,7 +206,8 @@ if [ "\$(grep nand /proc/partitions)" != "" ] && [ "\$(grep mmc /proc/partitions
+@@ -206,7 +206,9 @@ if [ "\$(grep nand /proc/partitions)" != "" ] && [ "\$(grep mmc /proc/partitions
 	cp /tmp/uImage /boot/uImage
 	rm -f /$installed_image_path
 else
 -	ln -sf $(basename $installed_image_path) /boot/$image_name || mv /$installed_image_path /boot/$image_name
+	ln -sf $(basename $installed_image_path) /boot/$image_name || mv /$installed_image_path /boot/$image_name
 +	ln -sf $(basename $installed_image_path) /boot/Image || mv /$installed_image_path /boot/Image
 +	mkimage -A arm64 -O linux -T kernel -C none -a 0x1080000 -e 0x1080000 -n "Linux kernel" -d /boot/$(basename $installed_image_path) /boot/uImage
 fi
--- a/patch/kernel/mvebu64-default/04-patch-4.4.131-132.patch
+++ b/patch/kernel/mvebu64-default/04-patch-4.4.131-132.patch
--- a/patch/kernel/mvebu64-default/04-patch-4.4.132-133.patch
+++ b/patch/kernel/mvebu64-default/04-patch-4.4.132-133.patch
--- a/patch/kernel/mvebu64-default/04-patch-4.4.133-134.patch
+++ b/patch/kernel/mvebu64-default/04-patch-4.4.133-134.patch
--- a/patch/kernel/mvebu64-default/04-patch-4.4.134-135.patch
+++ b/patch/kernel/mvebu64-default/04-patch-4.4.134-135.patch
@@ -0,0 +1,24 @@
+diff --git a/Makefile b/Makefile
+index 119dbcb4f311..9b14a5a224c5 100644
+--- a/Makefile
+++ b/Makefile
+@@ -1,6 +1,6 @@
+ VERSION = 4
+ PATCHLEVEL = 4
+-SUBLEVEL = 134
+SUBLEVEL = 135
+ EXTRAVERSION =
+ NAME = Blurry Fish Butt
+ 
+diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
+index fa79e8118b9b..4b7c81f88abf 100644
+--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
+@@ -366,6 +366,7 @@ static int vti_tunnel_init(struct net_device *dev)
+ 	memcpy(dev->dev_addr, &iph->saddr, 4);
+ 	memcpy(dev->broadcast, &iph->daddr, 4);
+ 
+	dev->mtu		= ETH_DATA_LEN;
+ 	dev->flags		= IFF_NOARP;
+ 	dev->addr_len		= 4;
+ 	dev->features		|= NETIF_F_LLTX;
--- a/patch/kernel/mvebu64-default/04-patch-4.4.135-136.patch
+++ b/patch/kernel/mvebu64-default/04-patch-4.4.135-136.patch
--- a/patch/kernel/mvebu64-default/04-patch-4.4.136-137.patch
+++ b/patch/kernel/mvebu64-default/04-patch-4.4.136-137.patch
@@ -0,0 +1,625 @@
+diff --git a/Documentation/networking/netdev-FAQ.txt b/Documentation/networking/netdev-FAQ.txt
+index 0fe1c6e0dbcd..bfc6b3e68cc4 100644
+--- a/Documentation/networking/netdev-FAQ.txt
+++ b/Documentation/networking/netdev-FAQ.txt
+@@ -168,6 +168,15 @@ A: No.  See above answer.  In short, if you think it really belongs in
+    dash marker line as described in Documentation/SubmittingPatches to
+    temporarily embed that information into the patch that you send.
+ 
+Q: Are all networking bug fixes backported to all stable releases?
+
+A: Due to capacity, Dave could only take care of the backports for the last
+   2 stable releases. For earlier stable releases, each stable branch maintainer
+   is supposed to take care of them. If you find any patch is missing from an
+   earlier stable branch, please notify stable@vger.kernel.org with either a
+   commit ID or a formal patch backported, and CC Dave and other relevant
+   networking developers.
+
+ Q: Someone said that the comment style and coding convention is different
+    for the networking content.  Is this true?
+ 
+diff --git a/Makefile b/Makefile
+index a05a7a005715..44efd1252ab8 100644
+--- a/Makefile
+++ b/Makefile
+@@ -1,6 +1,6 @@
+ VERSION = 4
+ PATCHLEVEL = 4
+-SUBLEVEL = 136
+SUBLEVEL = 137
+ EXTRAVERSION =
+ NAME = Blurry Fish Butt
+ 
+diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
+index a0d9ac6b6cc9..e759100e41a7 100644
+--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
+@@ -26,6 +26,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/freezer.h>
+ #include <linux/major.h>
+#include <linux/of.h>
+ #include "tpm.h"
+ #include "tpm_eventlog.h"
+ 
+@@ -324,8 +325,20 @@ static void tpm1_chip_unregister(struct tpm_chip *chip)
+  */
+ int tpm_chip_register(struct tpm_chip *chip)
+ {
+#ifdef CONFIG_OF
+	struct device_node *np;
+#endif
+ 	int rc;
+ 
+#ifdef CONFIG_OF
+	np = of_find_node_by_name(NULL, "vtpm");
+	if (np) {
+		if (of_property_read_bool(np, "powered-while-suspended"))
+			chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;
+	}
+	of_node_put(np);
+#endif
+
+ 	rc = tpm1_chip_register(chip);
+ 	if (rc)
+ 		return rc;
+diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
+index 36afc1a21699..95a40ec854ad 100644
+--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
+@@ -787,6 +787,10 @@ int tpm_do_selftest(struct tpm_chip *chip)
+ 	loops = jiffies_to_msecs(duration) / delay_msec;
+ 
+ 	rc = tpm_continue_selftest(chip);
+	if (rc == TPM_ERR_INVALID_POSTINIT) {
+		chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;
+		dev_info(&chip->dev, "TPM not ready (%d)\n", rc);
+	}
+ 	/* This may fail if there was no TPM driver during a suspend/resume
+ 	 * cycle; some may return 10 (BAD_ORDINAL), others 28 (FAILEDSELFTEST)
+ 	 */
+@@ -931,6 +935,9 @@ int tpm_pm_suspend(struct device *dev)
+ 	if (chip == NULL)
+ 		return -ENODEV;
+ 
+	if (chip->flags & TPM_CHIP_FLAG_ALWAYS_POWERED)
+		return 0;
+
+ 	if (chip->flags & TPM_CHIP_FLAG_TPM2) {
+ 		tpm2_shutdown(chip, TPM2_SU_STATE);
+ 		return 0;
+diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
+index 772d99b3a8e4..36e1abda00f9 100644
+--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
+@@ -168,6 +168,7 @@ struct tpm_vendor_specific {
+ enum tpm_chip_flags {
+ 	TPM_CHIP_FLAG_REGISTERED	= BIT(0),
+ 	TPM_CHIP_FLAG_TPM2		= BIT(1),
+	TPM_CHIP_FLAG_ALWAYS_POWERED	= BIT(5),
+ };
+ 
+ struct tpm_chip {
+diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
+index 6b5625e66119..88ceac091454 100644
+--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
+@@ -209,6 +209,7 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)
+ 		return -ENOMEM;
+ 
+ 	filp->private_data = priv;
+	filp->f_mode |= FMODE_UNSIGNED_OFFSET;
+ 	priv->filp = filp;
+ 	priv->uid = current_euid();
+ 	priv->pid = get_pid(task_pid(current));
+diff --git a/drivers/isdn/hardware/eicon/diva.c b/drivers/isdn/hardware/eicon/diva.c
+index d91dd580e978..37aaea88a6ad 100644
+--- a/drivers/isdn/hardware/eicon/diva.c
+++ b/drivers/isdn/hardware/eicon/diva.c
+@@ -387,10 +387,10 @@ void divasa_xdi_driver_unload(void)
+ **  Receive and process command from user mode utility
+ */
+ void *diva_xdi_open_adapter(void *os_handle, const void __user *src,
+-			    int length,
+			    int length, void *mptr,
+ 			    divas_xdi_copy_from_user_fn_t cp_fn)
+ {
+-	diva_xdi_um_cfg_cmd_t msg;
+	diva_xdi_um_cfg_cmd_t *msg = (diva_xdi_um_cfg_cmd_t *)mptr;
+ 	diva_os_xdi_adapter_t *a = NULL;
+ 	diva_os_spin_lock_magic_t old_irql;
+ 	struct list_head *tmp;
+@@ -400,21 +400,21 @@ void *diva_xdi_open_adapter(void *os_handle, const void __user *src,
+ 			 length, sizeof(diva_xdi_um_cfg_cmd_t)))
+ 			return NULL;
+ 	}
+-	if ((*cp_fn) (os_handle, &msg, src, sizeof(msg)) <= 0) {
+	if ((*cp_fn) (os_handle, msg, src, sizeof(*msg)) <= 0) {
+ 		DBG_ERR(("A: A(?) open, write error"))
+ 			return NULL;
+ 	}
+ 	diva_os_enter_spin_lock(&adapter_lock, &old_irql, "open_adapter");
+ 	list_for_each(tmp, &adapter_queue) {
+ 		a = list_entry(tmp, diva_os_xdi_adapter_t, link);
+-		if (a->controller == (int)msg.adapter)
+		if (a->controller == (int)msg->adapter)
+ 			break;
+ 		a = NULL;
+ 	}
+ 	diva_os_leave_spin_lock(&adapter_lock, &old_irql, "open_adapter");
+ 
+ 	if (!a) {
+-		DBG_ERR(("A: A(%d) open, adapter not found", msg.adapter))
+		DBG_ERR(("A: A(%d) open, adapter not found", msg->adapter))
+ 			}
+ 
+ 	return (a);
+@@ -436,8 +436,10 @@ void diva_xdi_close_adapter(void *adapter, void *os_handle)
+ 
+ int
+ diva_xdi_write(void *adapter, void *os_handle, const void __user *src,
+-	       int length, divas_xdi_copy_from_user_fn_t cp_fn)
+	       int length, void *mptr,
+	       divas_xdi_copy_from_user_fn_t cp_fn)
+ {
+	diva_xdi_um_cfg_cmd_t *msg = (diva_xdi_um_cfg_cmd_t *)mptr;
+ 	diva_os_xdi_adapter_t *a = (diva_os_xdi_adapter_t *) adapter;
+ 	void *data;
+ 
+@@ -458,7 +460,13 @@ diva_xdi_write(void *adapter, void *os_handle, const void __user *src,
+ 			return (-2);
+ 	}
+ 
+-	length = (*cp_fn) (os_handle, data, src, length);
+	if (msg) {
+		*(diva_xdi_um_cfg_cmd_t *)data = *msg;
+		length = (*cp_fn) (os_handle, (char *)data + sizeof(*msg),
+				   src + sizeof(*msg), length - sizeof(*msg));
+	} else {
+		length = (*cp_fn) (os_handle, data, src, length);
+	}
+ 	if (length > 0) {
+ 		if ((*(a->interface.cmd_proc))
+ 		    (a, (diva_xdi_um_cfg_cmd_t *) data, length)) {
+diff --git a/drivers/isdn/hardware/eicon/diva.h b/drivers/isdn/hardware/eicon/diva.h
+index e979085d1b89..a0a607c0c32e 100644
+--- a/drivers/isdn/hardware/eicon/diva.h
+++ b/drivers/isdn/hardware/eicon/diva.h
+@@ -19,10 +19,11 @@ int diva_xdi_read(void *adapter, void *os_handle, void __user *dst,
+ 		  int max_length, divas_xdi_copy_to_user_fn_t cp_fn);
+ 
+ int diva_xdi_write(void *adapter, void *os_handle, const void __user *src,
+-		   int length, divas_xdi_copy_from_user_fn_t cp_fn);
+		   int length, void *msg,
+		   divas_xdi_copy_from_user_fn_t cp_fn);
+ 
+ void *diva_xdi_open_adapter(void *os_handle, const void __user *src,
+-			    int length,
+			    int length, void *msg,
+ 			    divas_xdi_copy_from_user_fn_t cp_fn);
+ 
+ void diva_xdi_close_adapter(void *adapter, void *os_handle);
+diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
+index a2e0ed6c9a4d..91bd2ba0bdd8 100644
+--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
+@@ -591,19 +591,22 @@ static int divas_release(struct inode *inode, struct file *file)
+ static ssize_t divas_write(struct file *file, const char __user *buf,
+ 			   size_t count, loff_t *ppos)
+ {
+	diva_xdi_um_cfg_cmd_t msg;
+ 	int ret = -EINVAL;
+ 
+ 	if (!file->private_data) {
+ 		file->private_data = diva_xdi_open_adapter(file, buf,
+-							   count,
+							   count, &msg,
+ 							   xdi_copy_from_user);
+-	}
+-	if (!file->private_data) {
+-		return (-ENODEV);
+		if (!file->private_data)
+			return (-ENODEV);
+		ret = diva_xdi_write(file->private_data, file,
+				     buf, count, &msg, xdi_copy_from_user);
+	} else {
+		ret = diva_xdi_write(file->private_data, file,
+				     buf, count, NULL, xdi_copy_from_user);
+ 	}
+ 
+-	ret = diva_xdi_write(file->private_data, file,
+-			     buf, count, xdi_copy_from_user);
+ 	switch (ret) {
+ 	case -1:		/* Message should be removed from rx mailbox first */
+ 		ret = -EBUSY;
+@@ -622,11 +625,12 @@ static ssize_t divas_write(struct file *file, const char __user *buf,
+ static ssize_t divas_read(struct file *file, char __user *buf,
+ 			  size_t count, loff_t *ppos)
+ {
+	diva_xdi_um_cfg_cmd_t msg;
+ 	int ret = -EINVAL;
+ 
+ 	if (!file->private_data) {
+ 		file->private_data = diva_xdi_open_adapter(file, buf,
+-							   count,
+							   count, &msg,
+ 							   xdi_copy_from_user);
+ 	}
+ 	if (!file->private_data) {
+diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+index d946bba43726..87534c6efd66 100644
+--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+@@ -594,7 +594,7 @@ static void bnx2x_ets_e3b0_nig_disabled(const struct link_params *params,
+ 	 * slots for the highest priority.
+ 	 */
+ 	REG_WR(bp, (port) ? NIG_REG_P1_TX_ARB_NUM_STRICT_ARB_SLOTS :
+-		   NIG_REG_P1_TX_ARB_NUM_STRICT_ARB_SLOTS, 0x100);
+		   NIG_REG_P0_TX_ARB_NUM_STRICT_ARB_SLOTS, 0x100);
+ 	/* Mapping between the CREDIT_WEIGHT registers and actual client
+ 	 * numbers
+ 	 */
+diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
+index 0e3b2ebf87f1..029fa5bee520 100644
+--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
+@@ -2543,11 +2543,11 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+ 	pci_set_master(pdev);
+ 
+ 	/* Query PCI controller on system for DMA addressing
+-	 * limitation for the device.  Try 64-bit first, and
+	 * limitation for the device.  Try 47-bit first, and
+ 	 * fail to 32-bit.
+ 	 */
+ 
+-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
+	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(47));
+ 	if (err) {
+ 		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+ 		if (err) {
+@@ -2561,10 +2561,10 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+ 			goto err_out_release_regions;
+ 		}
+ 	} else {
+-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
+		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(47));
+ 		if (err) {
+ 			dev_err(dev, "Unable to obtain %u-bit DMA "
+-				"for consistent allocations, aborting\n", 64);
+				"for consistent allocations, aborting\n", 47);
+ 			goto err_out_release_regions;
+ 		}
+ 		using_dac = 1;
+diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c
+index 62f1a3433a62..d6d87dd8a28f 100644
+--- a/drivers/net/ethernet/mellanox/mlx4/qp.c
+++ b/drivers/net/ethernet/mellanox/mlx4/qp.c
+@@ -386,11 +386,11 @@ struct mlx4_qp *mlx4_qp_lookup(struct mlx4_dev *dev, u32 qpn)
+ 	struct mlx4_qp_table *qp_table = &mlx4_priv(dev)->qp_table;
+ 	struct mlx4_qp *qp;
+ 
+-	spin_lock(&qp_table->lock);
+	spin_lock_irq(&qp_table->lock);
+ 
+ 	qp = __mlx4_qp_lookup(dev, qpn);
+ 
+-	spin_unlock(&qp_table->lock);
+	spin_unlock_irq(&qp_table->lock);
+ 	return qp;
+ }
+ 
+diff --git a/drivers/net/ethernet/qlogic/qed/qed_cxt.c b/drivers/net/ethernet/qlogic/qed/qed_cxt.c
+index 7ccdb46c6764..21e0af2620ee 100644
+--- a/drivers/net/ethernet/qlogic/qed/qed_cxt.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_cxt.c
+@@ -43,7 +43,7 @@
+ #define ILT_CFG_REG(cli, reg)	PSWRQ2_REG_ ## cli ## _ ## reg ## _RT_OFFSET
+ 
+ /* ILT entry structure */
+-#define ILT_ENTRY_PHY_ADDR_MASK		0x000FFFFFFFFFFFULL
+#define ILT_ENTRY_PHY_ADDR_MASK		(~0ULL >> 12)
+ #define ILT_ENTRY_PHY_ADDR_SHIFT	0
+ #define ILT_ENTRY_VALID_MASK		0x1ULL
+ #define ILT_ENTRY_VALID_SHIFT		52
+diff --git a/drivers/net/phy/bcm-cygnus.c b/drivers/net/phy/bcm-cygnus.c
+index 49bbc6826883..9a7dca2bb618 100644
+--- a/drivers/net/phy/bcm-cygnus.c
+++ b/drivers/net/phy/bcm-cygnus.c
+@@ -61,17 +61,17 @@ static int bcm_cygnus_afe_config(struct phy_device *phydev)
+ 		return rc;
+ 
+ 	/* make rcal=100, since rdb default is 000 */
+-	rc = bcm_phy_write_exp(phydev, MII_BRCM_CORE_EXPB1, 0x10);
+	rc = bcm_phy_write_exp_sel(phydev, MII_BRCM_CORE_EXPB1, 0x10);
+ 	if (rc < 0)
+ 		return rc;
+ 
+ 	/* CORE_EXPB0, Reset R_CAL/RC_CAL Engine */
+-	rc = bcm_phy_write_exp(phydev, MII_BRCM_CORE_EXPB0, 0x10);
+	rc = bcm_phy_write_exp_sel(phydev, MII_BRCM_CORE_EXPB0, 0x10);
+ 	if (rc < 0)
+ 		return rc;
+ 
+ 	/* CORE_EXPB0, Disable Reset R_CAL/RC_CAL Engine */
+-	rc = bcm_phy_write_exp(phydev, MII_BRCM_CORE_EXPB0, 0x00);
+	rc = bcm_phy_write_exp_sel(phydev, MII_BRCM_CORE_EXPB0, 0x00);
+ 
+ 	return 0;
+ }
+diff --git a/drivers/net/phy/bcm-phy-lib.h b/drivers/net/phy/bcm-phy-lib.h
+index b2091c88b44d..ce16b26d49ff 100644
+--- a/drivers/net/phy/bcm-phy-lib.h
+++ b/drivers/net/phy/bcm-phy-lib.h
+@@ -14,11 +14,18 @@
+ #ifndef _LINUX_BCM_PHY_LIB_H
+ #define _LINUX_BCM_PHY_LIB_H
+ 
+#include <linux/brcmphy.h>
+ #include <linux/phy.h>
+ 
+ int bcm_phy_write_exp(struct phy_device *phydev, u16 reg, u16 val);
+ int bcm_phy_read_exp(struct phy_device *phydev, u16 reg);
+ 
+static inline int bcm_phy_write_exp_sel(struct phy_device *phydev,
+					u16 reg, u16 val)
+{
+	return bcm_phy_write_exp(phydev, reg | MII_BCM54XX_EXP_SEL_ER, val);
+}
+
+ int bcm_phy_write_misc(struct phy_device *phydev,
+ 		       u16 reg, u16 chl, u16 value);
+ int bcm_phy_read_misc(struct phy_device *phydev,
+diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c
+index 03d4809a9126..bffa70e46202 100644
+--- a/drivers/net/phy/bcm7xxx.c
+++ b/drivers/net/phy/bcm7xxx.c
+@@ -48,10 +48,10 @@
+ static void r_rc_cal_reset(struct phy_device *phydev)
+ {
+ 	/* Reset R_CAL/RC_CAL Engine */
+-	bcm_phy_write_exp(phydev, 0x00b0, 0x0010);
+	bcm_phy_write_exp_sel(phydev, 0x00b0, 0x0010);
+ 
+ 	/* Disable Reset R_AL/RC_CAL Engine */
+-	bcm_phy_write_exp(phydev, 0x00b0, 0x0000);
+	bcm_phy_write_exp_sel(phydev, 0x00b0, 0x0000);
+ }
+ 
+ static int bcm7xxx_28nm_b0_afe_config_init(struct phy_device *phydev)
+diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
+index e74709e4b5dd..49174837c2ba 100644
+--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
+@@ -983,7 +983,8 @@ static void team_port_disable(struct team *team,
+ static void ___team_compute_features(struct team *team)
+ {
+ 	struct team_port *port;
+-	u32 vlan_features = TEAM_VLAN_FEATURES & NETIF_F_ALL_FOR_ALL;
+	netdev_features_t vlan_features = TEAM_VLAN_FEATURES &
+					  NETIF_F_ALL_FOR_ALL;
+ 	unsigned short max_hard_header_len = ETH_HLEN;
+ 	unsigned int dst_release_flag = IFF_XMIT_DST_RELEASE |
+ 					IFF_XMIT_DST_RELEASE_PERM;
+diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c
+index 96a5028621c8..8edbccf06b7b 100644
+--- a/drivers/net/usb/cdc_mbim.c
+++ b/drivers/net/usb/cdc_mbim.c
+@@ -593,7 +593,7 @@ static const struct driver_info cdc_mbim_info_zlp = {
+  */
+ static const struct driver_info cdc_mbim_info_ndp_to_end = {
+ 	.description = "CDC MBIM",
+-	.flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN,
+	.flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN | FLAG_SEND_ZLP,
+ 	.bind = cdc_mbim_bind,
+ 	.unbind = cdc_mbim_unbind,
+ 	.manage_power = cdc_mbim_manage_power,
+diff --git a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
+index 83e5aa6a9f28..ad35e760ed3f 100644
+--- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
+@@ -6167,7 +6167,7 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,
+ 		  req->alpha2[0], req->alpha2[1]);
+ 
+ 	/* ignore non-ISO3166 country codes */
+-	for (i = 0; i < sizeof(req->alpha2); i++)
+	for (i = 0; i < 2; i++)
+ 		if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') {
+ 			brcmf_err("not a ISO3166 code\n");
+ 			return;
+diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
+index f52c72a1a06f..73b725f965eb 100644
+--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
+@@ -3323,8 +3323,6 @@ maybe_sleep:
+ 		 */
+ 		if (iclog->ic_state & XLOG_STATE_IOERROR)
+ 			return -EIO;
+-		if (log_flushed)
+-			*log_flushed = 1;
+ 	} else {
+ 
+ no_sleep:
+@@ -3432,8 +3430,6 @@ try_again:
+ 
+ 				xlog_wait(&iclog->ic_prev->ic_write_wait,
+ 							&log->l_icloglock);
+-				if (log_flushed)
+-					*log_flushed = 1;
+ 				already_slept = 1;
+ 				goto try_again;
+ 			}
+@@ -3467,9 +3463,6 @@ try_again:
+ 			 */
+ 			if (iclog->ic_state & XLOG_STATE_IOERROR)
+ 				return -EIO;
+-
+-			if (log_flushed)
+-				*log_flushed = 1;
+ 		} else {		/* just return */
+ 			spin_unlock(&log->l_icloglock);
+ 		}
+diff --git a/mm/mmap.c b/mm/mmap.c
+index cc84b97ca250..39f5fbd07486 100644
+--- a/mm/mmap.c
+++ b/mm/mmap.c
+@@ -1275,6 +1275,35 @@ static inline int mlock_future_check(struct mm_struct *mm,
+ 	return 0;
+ }
+ 
+static inline u64 file_mmap_size_max(struct file *file, struct inode *inode)
+{
+	if (S_ISREG(inode->i_mode))
+		return MAX_LFS_FILESIZE;
+
+	if (S_ISBLK(inode->i_mode))
+		return MAX_LFS_FILESIZE;
+
+	/* Special "we do even unsigned file positions" case */
+	if (file->f_mode & FMODE_UNSIGNED_OFFSET)
+		return 0;
+
+	/* Yes, random drivers might want more. But I'm tired of buggy drivers */
+	return ULONG_MAX;
+}
+
+static inline bool file_mmap_ok(struct file *file, struct inode *inode,
+				unsigned long pgoff, unsigned long len)
+{
+	u64 maxsize = file_mmap_size_max(file, inode);
+
+	if (maxsize && len > maxsize)
+		return false;
+	maxsize -= len;
+	if (pgoff > maxsize >> PAGE_SHIFT)
+		return false;
+	return true;
+}
+
+ /*
+  * The caller must hold down_write(&current->mm->mmap_sem).
+  */
+@@ -1340,6 +1369,9 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
+ 	if (file) {
+ 		struct inode *inode = file_inode(file);
+ 
+		if (!file_mmap_ok(file, inode, pgoff, len))
+			return -EOVERFLOW;
+
+ 		switch (flags & MAP_TYPE) {
+ 		case MAP_SHARED:
+ 			if ((prot&PROT_WRITE) && !(file->f_mode&FMODE_WRITE))
+diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
+index 5b3d611d8b5f..2017ffa5197a 100644
+--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
+@@ -1691,6 +1691,10 @@ static int do_setlink(const struct sk_buff *skb,
+ 	const struct net_device_ops *ops = dev->netdev_ops;
+ 	int err;
+ 
+	err = validate_linkmsg(dev, tb);
+	if (err < 0)
+		return err;
+
+ 	if (tb[IFLA_NET_NS_PID] || tb[IFLA_NET_NS_FD]) {
+ 		struct net *net = rtnl_link_get_net(dev_net(dev), tb);
+ 		if (IS_ERR(net)) {
+@@ -1982,10 +1986,6 @@ static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh)
+ 		goto errout;
+ 	}
+ 
+-	err = validate_linkmsg(dev, tb);
+-	if (err < 0)
+-		goto errout;
+-
+ 	err = do_setlink(skb, dev, ifm, tb, ifname, 0);
+ errout:
+ 	return err;
+diff --git a/net/dccp/proto.c b/net/dccp/proto.c
+index ff3b058cf58c..936dab12f99f 100644
+--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
+@@ -280,9 +280,7 @@ int dccp_disconnect(struct sock *sk, int flags)
+ 
+ 	dccp_clear_xmit_timers(sk);
+ 	ccid_hc_rx_delete(dp->dccps_hc_rx_ccid, sk);
+-	ccid_hc_tx_delete(dp->dccps_hc_tx_ccid, sk);
+ 	dp->dccps_hc_rx_ccid = NULL;
+-	dp->dccps_hc_tx_ccid = NULL;
+ 
+ 	__skb_queue_purge(&sk->sk_receive_queue);
+ 	__skb_queue_purge(&sk->sk_write_queue);
+diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
+index 44abc52bae13..9d144cbd4e62 100644
+--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
+@@ -979,6 +979,8 @@ fib_convert_metrics(struct fib_info *fi, const struct fib_config *cfg)
+ 			if (val == TCP_CA_UNSPEC)
+ 				return -EINVAL;
+ 		} else {
+			if (nla_len(nla) != sizeof(u32))
+				return false;
+ 			val = nla_get_u32(nla);
+ 		}
+ 		if (type == RTAX_ADVMSS && val > 65535 - 40)
+diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
+index 1b93ea766916..ce9a7fbb7c5f 100644
+--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
+@@ -493,8 +493,6 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
+ 	int err;
+ 	int copied;
+ 
+-	WARN_ON_ONCE(sk->sk_family == AF_INET6);
+-
+ 	err = -EAGAIN;
+ 	skb = sock_dequeue_err_skb(sk);
+ 	if (!skb)
+diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
+index e5846d1f9b55..9b92960f024d 100644
+--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
+@@ -1787,7 +1787,8 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns
+ 		ret = 0;
+ 		if (!ip6mr_new_table(net, v))
+ 			ret = -ENOMEM;
+-		raw6_sk(sk)->ip6mr_table = v;
+		else
+			raw6_sk(sk)->ip6mr_table = v;
+ 		rtnl_unlock();
+ 		return ret;
+ 	}
+diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
+index 392d4e2c0a24..3a63f33698d3 100644
+--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
+@@ -2779,7 +2779,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)
+ 		if (unlikely(offset < 0))
+ 			goto out_free;
+ 	} else if (reserve) {
+-		skb_push(skb, reserve);
+		skb_reserve(skb, -reserve);
+ 	}
+ 
+ 	/* Returns -EFAULT on error */
+@@ -4198,7 +4198,7 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
+ 			goto out;
+ 		if (po->tp_version >= TPACKET_V3 &&
+ 		    req->tp_block_size <=
+-			  BLK_PLUS_PRIV((u64)req_u->req3.tp_sizeof_priv))
+		    BLK_PLUS_PRIV((u64)req_u->req3.tp_sizeof_priv) + sizeof(struct tpacket3_hdr))
+ 			goto out;
+ 		if (unlikely(req->tp_frame_size < po->tp_hdrlen +
+ 					po->tp_reserve))
+diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
+index dd243d2abd87..138d7f100f7e 100644
+--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
+@@ -743,7 +743,7 @@ int conf_write(const char *name)
+ 	struct menu *menu;
+ 	const char *basename;
+ 	const char *str;
+-	char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
+	char dirname[PATH_MAX+1], tmpname[PATH_MAX+22], newname[PATH_MAX+8];
+ 	char *env;
+ 
+ 	dirname[0] = 0;
--- a/patch/kernel/mvebu64-default/04-patch-4.4.137-138.patch
+++ b/patch/kernel/mvebu64-default/04-patch-4.4.137-138.patch
--- a/patch/kernel/mvebu64-default/wifi-0001-realtek-881xAU-605ecfa.patch
+++ b/patch/kernel/mvebu64-default/wifi-0001-realtek-881xAU-605ecfa.patch
@@ -361,7 +361,7 @@ index 0000000..d159169
 +library.  If this is what you want to do, use the GNU Lesser General
 +Public License instead of this License.
 diff --git a/drivers/net/wireless/rtl8812au/Makefile b/drivers/net/wireless/rtl8812au/Makefile
-new file mode 100755
+new file mode 100644
 index 0000000..ef959e7
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/Makefile
@@ -110647,7 +110647,7 @@ index 0000000..cf167a5
 +
 +#endif
 diff --git a/drivers/net/wireless/rtl8812au/hal/btc/HalBtc8703b2Ant.c b/drivers/net/wireless/rtl8812au/hal/btc/HalBtc8703b2Ant.c
-new file mode 100755
+new file mode 100644
 index 0000000..d5c5c47
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/btc/HalBtc8703b2Ant.c
@@ -115517,7 +115517,7 @@ index 0000000..d5c5c47
 +#endif
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/btc/HalBtc8703b2Ant.h b/drivers/net/wireless/rtl8812au/hal/btc/HalBtc8703b2Ant.h
-new file mode 100755
+new file mode 100644
 index 0000000..361c443
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/btc/HalBtc8703b2Ant.h
@@ -267231,7 +267231,7 @@ index 0000000..ec8c6fa
 +#endif
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_rxhp.c b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_rxhp.c
-new file mode 100755
+new file mode 100644
 index 0000000..8a4a273
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_rxhp.c
@@ -268929,7 +268929,7 @@ index 0000000..8a4a273
 +
 + 
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/phydm_rxhp.h b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_rxhp.h
-new file mode 100755
+new file mode 100644
 index 0000000..a1fe97f
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/phydm_rxhp.h
@@ -320394,7 +320394,7 @@ index 0000000..e9c28bf
 +#define	COMMIT_BY_8814A			"BB_LUKE"
 +#define	RELEASE_VERSION_8814A	81
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_bb.c b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_bb.c
-new file mode 100755
+new file mode 100644
 index 0000000..09f3fbf
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_bb.c
@@ -321205,7 +321205,7 @@ index 0000000..09f3fbf
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_bb.h b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_bb.h
-new file mode 100755
+new file mode 100644
 index 0000000..a5429f1
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_bb.h
@@ -321280,7 +321280,7 @@ index 0000000..a5429f1
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_fw.c b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_fw.c
-new file mode 100755
+new file mode 100644
 index 0000000..dc91392
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_fw.c
@@ -327923,7 +327923,7 @@ index 0000000..dc91392
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_fw.h b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_fw.h
-new file mode 100755
+new file mode 100644
 index 0000000..945819a
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_fw.h
@@ -328002,7 +328002,7 @@ index 0000000..945819a
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_mac.c b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_mac.c
-new file mode 100755
+new file mode 100644
 index 0000000..ed73444
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_mac.c
@@ -328294,7 +328294,7 @@ index 0000000..ed73444
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_mac.h b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_mac.h
-new file mode 100755
+new file mode 100644
 index 0000000..73158b4
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_mac.h
@@ -328339,7 +328339,7 @@ index 0000000..73158b4
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_rf.c b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_rf.c
-new file mode 100755
+new file mode 100644
 index 0000000..29df963
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_rf.c
@@ -333809,7 +333809,7 @@ index 0000000..29df963
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_rf.h b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_rf.h
-new file mode 100755
+new file mode 100644
 index 0000000..c4dd473
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halhwimg8821a_rf.h
@@ -333964,7 +333964,7 @@ index 0000000..c4dd473
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halphyrf_8821a_ce.c b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halphyrf_8821a_ce.c
-new file mode 100755
+new file mode 100644
 index 0000000..01da5a1
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halphyrf_8821a_ce.c
@@ -334295,7 +334295,7 @@ index 0000000..01da5a1
 +
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halphyrf_8821a_ce.h b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halphyrf_8821a_ce.h
-new file mode 100755
+new file mode 100644
 index 0000000..688a95e
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halphyrf_8821a_ce.h
@@ -334353,7 +334353,7 @@ index 0000000..688a95e
 +#endif	// #ifndef __HAL_PHY_RF_8821A_H__								
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halphyrf_8821a_win.c b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halphyrf_8821a_win.c
-new file mode 100755
+new file mode 100644
 index 0000000..40d6b52
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halphyrf_8821a_win.c
@@ -335507,7 +335507,7 @@ index 0000000..40d6b52
 +
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halphyrf_8821a_win.h b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halphyrf_8821a_win.h
-new file mode 100755
+new file mode 100644
 index 0000000..5d239ad
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/halphyrf_8821a_win.h
@@ -335585,7 +335585,7 @@ index 0000000..5d239ad
 +#endif	// #ifndef __HAL_PHY_RF_8821A_H__								
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_ap.c b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_ap.c
-new file mode 100755
+new file mode 100644
 index 0000000..382025b
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_ap.c
@@ -336466,7 +336466,7 @@ index 0000000..382025b
 +#endif
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_ap.h b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_ap.h
-new file mode 100755
+new file mode 100644
 index 0000000..8c74fec
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_ap.h
@@ -336520,7 +336520,7 @@ index 0000000..8c74fec
 +#endif	// #ifndef __PHYDM_IQK_8821A_H__								
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_ce.c b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_ce.c
-new file mode 100755
+new file mode 100644
 index 0000000..28905fd
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_ce.c
@@ -337402,7 +337402,7 @@ index 0000000..28905fd
 +#endif
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_ce.h b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_ce.h
-new file mode 100755
+new file mode 100644
 index 0000000..f44f445
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_ce.h
@@ -337456,7 +337456,7 @@ index 0000000..f44f445
 +#endif	// #ifndef __PHYDM_IQK_8821A_H__								
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_win.c b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_win.c
-new file mode 100755
+new file mode 100644
 index 0000000..aeb4979
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_win.c
@@ -338337,7 +338337,7 @@ index 0000000..aeb4979
 +#endif
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_win.h b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_win.h
-new file mode 100755
+new file mode 100644
 index 0000000..8c74fec
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_iqk_8821a_win.h
@@ -338391,7 +338391,7 @@ index 0000000..8c74fec
 +#endif	// #ifndef __PHYDM_IQK_8821A_H__								
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_regconfig8821a.c b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_regconfig8821a.c
-new file mode 100755
+new file mode 100644
 index 0000000..c09db08
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_regconfig8821a.c
@@ -338617,7 +338617,7 @@ index 0000000..c09db08
 +#endif	/* #if (RTL8821A_SUPPORT == 1)*/
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_regconfig8821a.h b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_regconfig8821a.h
-new file mode 100755
+new file mode 100644
 index 0000000..a07fd74
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_regconfig8821a.h
@@ -338719,7 +338719,7 @@ index 0000000..a07fd74
 +#endif // end of SUPPORT
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_rtl8821a.c b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_rtl8821a.c
-new file mode 100755
+new file mode 100644
 index 0000000..27bccb3
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_rtl8821a.c
@@ -338795,7 +338795,7 @@ index 0000000..27bccb3
 +#endif //#if (RTL8821A_SUPPORT == 1)
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_rtl8821a.h b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_rtl8821a.h
-new file mode 100755
+new file mode 100644
 index 0000000..0b5edf5
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/phydm_rtl8821a.h
@@ -338830,7 +338830,7 @@ index 0000000..0b5edf5
 +#endif
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/version_rtl8821a.h b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/version_rtl8821a.h
-new file mode 100755
+new file mode 100644
 index 0000000..5e10b15
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/rtl8821a/version_rtl8821a.h
@@ -340785,7 +340785,7 @@ index 0000000..7efdc02
 +#endif
 +
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/txbf/haltxbf8821b.c b/drivers/net/wireless/rtl8812au/hal/phydm/txbf/haltxbf8821b.c
-new file mode 100755
+new file mode 100644
 index 0000000..eff8e98
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/txbf/haltxbf8821b.c
@@ -341191,7 +341191,7 @@ index 0000000..eff8e98
 +
 +#endif
 diff --git a/drivers/net/wireless/rtl8812au/hal/phydm/txbf/haltxbf8821b.h b/drivers/net/wireless/rtl8812au/hal/phydm/txbf/haltxbf8821b.h
-new file mode 100755
+new file mode 100644
 index 0000000..c92d79a
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/hal/phydm/txbf/haltxbf8821b.h
@@ -412866,7 +412866,7 @@ index 0000000..4ab4feb
 +
 +#endif /* __HAL_COMMON_H__ */
 diff --git a/drivers/net/wireless/rtl8812au/include/hal_data.h b/drivers/net/wireless/rtl8812au/include/hal_data.h
-new file mode 100755
+new file mode 100644
 index 0000000..a9dd586
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/include/hal_data.h
@@ -413649,7 +413649,7 @@ index 0000000..a9dd586
 +
 +#endif /* __HAL_DATA_H__ */
 diff --git a/drivers/net/wireless/rtl8812au/include/hal_data.h.edited b/drivers/net/wireless/rtl8812au/include/hal_data.h.edited
-new file mode 100755
+new file mode 100644
 index 0000000..ec59ebb
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/include/hal_data.h.edited
@@ -428588,7 +428588,7 @@ index 0000000..a3bb7df
 +
 +#endif
 diff --git a/drivers/net/wireless/rtl8812au/include/rtl8723b_hal.h b/drivers/net/wireless/rtl8812au/include/rtl8723b_hal.h
-new file mode 100755
+new file mode 100644
 index 0000000..e6391a4
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/include/rtl8723b_hal.h
@@ -428892,7 +428892,7 @@ index 0000000..e6391a4
 +
 +#endif
 diff --git a/drivers/net/wireless/rtl8812au/include/rtl8723b_led.h b/drivers/net/wireless/rtl8812au/include/rtl8723b_led.h
-new file mode 100755
+new file mode 100644
 index 0000000..0a7b2c9
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/include/rtl8723b_led.h
@@ -428946,7 +428946,7 @@ index 0000000..0a7b2c9
 +
 +#endif
 diff --git a/drivers/net/wireless/rtl8812au/include/rtl8723b_recv.h b/drivers/net/wireless/rtl8812au/include/rtl8723b_recv.h
-new file mode 100755
+new file mode 100644
 index 0000000..fd9faef
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/include/rtl8723b_recv.h
@@ -429079,7 +429079,7 @@ index 0000000..bf56dde
 +
 +#endif
 diff --git a/drivers/net/wireless/rtl8812au/include/rtl8723b_spec.h b/drivers/net/wireless/rtl8812au/include/rtl8723b_spec.h
-new file mode 100755
+new file mode 100644
 index 0000000..85b9d1e
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/include/rtl8723b_spec.h
@@ -429416,7 +429416,7 @@ index 0000000..8067359
 +#endif
 +#endif
 diff --git a/drivers/net/wireless/rtl8812au/include/rtl8723b_xmit.h b/drivers/net/wireless/rtl8812au/include/rtl8723b_xmit.h
-new file mode 100755
+new file mode 100644
 index 0000000..7cc33e1
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/include/rtl8723b_xmit.h
@@ -433210,7 +433210,7 @@ index 0000000..9fe4dfb
 +#include "rtl8821a_xmit.h"
 +#endif /* CONFIG_RTL8821A */
 diff --git a/drivers/net/wireless/rtl8812au/include/rtl8814a_cmd.h b/drivers/net/wireless/rtl8812au/include/rtl8814a_cmd.h
-new file mode 100755
+new file mode 100644
 index 0000000..e2e0236
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/include/rtl8814a_cmd.h
@@ -433408,7 +433408,7 @@ index 0000000..bb925e4
 +
 +#endif
 diff --git a/drivers/net/wireless/rtl8812au/include/rtl8814a_hal.h b/drivers/net/wireless/rtl8812au/include/rtl8814a_hal.h
-new file mode 100755
+new file mode 100644
 index 0000000..a2846bb
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/include/rtl8814a_hal.h
@@ -433785,7 +433785,7 @@ index 0000000..1137a9b
 +
 +#endif /* __RTL8814A_LED_H__ */
 diff --git a/drivers/net/wireless/rtl8812au/include/rtl8814a_recv.h b/drivers/net/wireless/rtl8812au/include/rtl8814a_recv.h
-new file mode 100755
+new file mode 100644
 index 0000000..e9626f3
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/include/rtl8814a_recv.h
@@ -434021,7 +434021,7 @@ index 0000000..7b11d99
 +
 +#endif/* __RTL8188E_RF_H__ */
 diff --git a/drivers/net/wireless/rtl8812au/include/rtl8814a_spec.h b/drivers/net/wireless/rtl8812au/include/rtl8814a_spec.h
-new file mode 100755
+new file mode 100644
 index 0000000..43a6381
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/include/rtl8814a_spec.h
@@ -434713,7 +434713,7 @@ index 0000000..5d95e1f
 +#endif
 +#endif
 diff --git a/drivers/net/wireless/rtl8812au/include/rtl8814a_xmit.h b/drivers/net/wireless/rtl8812au/include/rtl8814a_xmit.h
-new file mode 100755
+new file mode 100644
 index 0000000..099760d
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/include/rtl8814a_xmit.h
@@ -435914,7 +435914,7 @@ index 0000000..089f97d
 +
 +#endif /* _RTL8822B_HAL_H_ */
 diff --git a/drivers/net/wireless/rtl8812au/include/rtl8822be_hal.h b/drivers/net/wireless/rtl8812au/include/rtl8822be_hal.h
-new file mode 100755
+new file mode 100644
 index 0000000..8379fab
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8812au/include/rtl8822be_hal.h
@@ -496518,7 +496518,7 @@ index 0000000..d159169
 +library.  If this is what you want to do, use the GNU Lesser General
 +Public License instead of this License.
 diff --git a/drivers/net/wireless/rtl8814au/Makefile b/drivers/net/wireless/rtl8814au/Makefile
-new file mode 100755
+new file mode 100644
 index 0000000..ef959e7
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/Makefile
@@ -606804,7 +606804,7 @@ index 0000000..cf167a5
 +
 +#endif
 diff --git a/drivers/net/wireless/rtl8814au/hal/btc/HalBtc8703b2Ant.c b/drivers/net/wireless/rtl8814au/hal/btc/HalBtc8703b2Ant.c
-new file mode 100755
+new file mode 100644
 index 0000000..d5c5c47
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/btc/HalBtc8703b2Ant.c
@@ -611674,7 +611674,7 @@ index 0000000..d5c5c47
 +#endif
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/btc/HalBtc8703b2Ant.h b/drivers/net/wireless/rtl8814au/hal/btc/HalBtc8703b2Ant.h
-new file mode 100755
+new file mode 100644
 index 0000000..361c443
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/btc/HalBtc8703b2Ant.h
@@ -763388,7 +763388,7 @@ index 0000000..ec8c6fa
 +#endif
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/phydm_rxhp.c b/drivers/net/wireless/rtl8814au/hal/phydm/phydm_rxhp.c
-new file mode 100755
+new file mode 100644
 index 0000000..8a4a273
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/phydm_rxhp.c
@@ -765086,7 +765086,7 @@ index 0000000..8a4a273
 +
 + 
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/phydm_rxhp.h b/drivers/net/wireless/rtl8814au/hal/phydm/phydm_rxhp.h
-new file mode 100755
+new file mode 100644
 index 0000000..a1fe97f
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/phydm_rxhp.h
@@ -816551,7 +816551,7 @@ index 0000000..e9c28bf
 +#define	COMMIT_BY_8814A			"BB_LUKE"
 +#define	RELEASE_VERSION_8814A	81
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_bb.c b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_bb.c
-new file mode 100755
+new file mode 100644
 index 0000000..09f3fbf
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_bb.c
@@ -817362,7 +817362,7 @@ index 0000000..09f3fbf
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_bb.h b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_bb.h
-new file mode 100755
+new file mode 100644
 index 0000000..a5429f1
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_bb.h
@@ -817437,7 +817437,7 @@ index 0000000..a5429f1
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_fw.c b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_fw.c
-new file mode 100755
+new file mode 100644
 index 0000000..dc91392
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_fw.c
@@ -824080,7 +824080,7 @@ index 0000000..dc91392
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_fw.h b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_fw.h
-new file mode 100755
+new file mode 100644
 index 0000000..945819a
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_fw.h
@@ -824159,7 +824159,7 @@ index 0000000..945819a
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_mac.c b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_mac.c
-new file mode 100755
+new file mode 100644
 index 0000000..ed73444
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_mac.c
@@ -824451,7 +824451,7 @@ index 0000000..ed73444
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_mac.h b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_mac.h
-new file mode 100755
+new file mode 100644
 index 0000000..73158b4
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_mac.h
@@ -824496,7 +824496,7 @@ index 0000000..73158b4
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_rf.c b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_rf.c
-new file mode 100755
+new file mode 100644
 index 0000000..29df963
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_rf.c
@@ -829966,7 +829966,7 @@ index 0000000..29df963
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_rf.h b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_rf.h
-new file mode 100755
+new file mode 100644
 index 0000000..c4dd473
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halhwimg8821a_rf.h
@@ -830121,7 +830121,7 @@ index 0000000..c4dd473
 +#endif /* end of HWIMG_SUPPORT*/
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halphyrf_8821a_ce.c b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halphyrf_8821a_ce.c
-new file mode 100755
+new file mode 100644
 index 0000000..01da5a1
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halphyrf_8821a_ce.c
@@ -830452,7 +830452,7 @@ index 0000000..01da5a1
 +
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halphyrf_8821a_ce.h b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halphyrf_8821a_ce.h
-new file mode 100755
+new file mode 100644
 index 0000000..688a95e
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halphyrf_8821a_ce.h
@@ -830510,7 +830510,7 @@ index 0000000..688a95e
 +#endif	// #ifndef __HAL_PHY_RF_8821A_H__								
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halphyrf_8821a_win.c b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halphyrf_8821a_win.c
-new file mode 100755
+new file mode 100644
 index 0000000..40d6b52
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halphyrf_8821a_win.c
@@ -831664,7 +831664,7 @@ index 0000000..40d6b52
 +
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halphyrf_8821a_win.h b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halphyrf_8821a_win.h
-new file mode 100755
+new file mode 100644
 index 0000000..5d239ad
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/halphyrf_8821a_win.h
@@ -831742,7 +831742,7 @@ index 0000000..5d239ad
 +#endif	// #ifndef __HAL_PHY_RF_8821A_H__								
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_ap.c b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_ap.c
-new file mode 100755
+new file mode 100644
 index 0000000..382025b
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_ap.c
@@ -832623,7 +832623,7 @@ index 0000000..382025b
 +#endif
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_ap.h b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_ap.h
-new file mode 100755
+new file mode 100644
 index 0000000..8c74fec
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_ap.h
@@ -832677,7 +832677,7 @@ index 0000000..8c74fec
 +#endif	// #ifndef __PHYDM_IQK_8821A_H__								
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_ce.c b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_ce.c
-new file mode 100755
+new file mode 100644
 index 0000000..28905fd
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_ce.c
@@ -833559,7 +833559,7 @@ index 0000000..28905fd
 +#endif
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_ce.h b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_ce.h
-new file mode 100755
+new file mode 100644
 index 0000000..f44f445
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_ce.h
@@ -833613,7 +833613,7 @@ index 0000000..f44f445
 +#endif	// #ifndef __PHYDM_IQK_8821A_H__								
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_win.c b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_win.c
-new file mode 100755
+new file mode 100644
 index 0000000..aeb4979
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_win.c
@@ -834494,7 +834494,7 @@ index 0000000..aeb4979
 +#endif
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_win.h b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_win.h
-new file mode 100755
+new file mode 100644
 index 0000000..8c74fec
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_iqk_8821a_win.h
@@ -834548,7 +834548,7 @@ index 0000000..8c74fec
 +#endif	// #ifndef __PHYDM_IQK_8821A_H__								
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_regconfig8821a.c b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_regconfig8821a.c
-new file mode 100755
+new file mode 100644
 index 0000000..c09db08
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_regconfig8821a.c
@@ -834774,7 +834774,7 @@ index 0000000..c09db08
 +#endif	/* #if (RTL8821A_SUPPORT == 1)*/
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_regconfig8821a.h b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_regconfig8821a.h
-new file mode 100755
+new file mode 100644
 index 0000000..a07fd74
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_regconfig8821a.h
@@ -834876,7 +834876,7 @@ index 0000000..a07fd74
 +#endif // end of SUPPORT
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_rtl8821a.c b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_rtl8821a.c
-new file mode 100755
+new file mode 100644
 index 0000000..27bccb3
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_rtl8821a.c
@@ -834952,7 +834952,7 @@ index 0000000..27bccb3
 +#endif //#if (RTL8821A_SUPPORT == 1)
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_rtl8821a.h b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_rtl8821a.h
-new file mode 100755
+new file mode 100644
 index 0000000..0b5edf5
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/phydm_rtl8821a.h
@@ -834987,7 +834987,7 @@ index 0000000..0b5edf5
 +#endif
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/version_rtl8821a.h b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/version_rtl8821a.h
-new file mode 100755
+new file mode 100644
 index 0000000..5e10b15
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/rtl8821a/version_rtl8821a.h
@@ -836942,7 +836942,7 @@ index 0000000..7efdc02
 +#endif
 +
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/txbf/haltxbf8821b.c b/drivers/net/wireless/rtl8814au/hal/phydm/txbf/haltxbf8821b.c
-new file mode 100755
+new file mode 100644
 index 0000000..eff8e98
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/txbf/haltxbf8821b.c
@@ -837348,7 +837348,7 @@ index 0000000..eff8e98
 +
 +#endif
 diff --git a/drivers/net/wireless/rtl8814au/hal/phydm/txbf/haltxbf8821b.h b/drivers/net/wireless/rtl8814au/hal/phydm/txbf/haltxbf8821b.h
-new file mode 100755
+new file mode 100644
 index 0000000..c92d79a
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/hal/phydm/txbf/haltxbf8821b.h
@@ -909023,7 +909023,7 @@ index 0000000..4ab4feb
 +
 +#endif /* __HAL_COMMON_H__ */
 diff --git a/drivers/net/wireless/rtl8814au/include/hal_data.h b/drivers/net/wireless/rtl8814au/include/hal_data.h
-new file mode 100755
+new file mode 100644
 index 0000000..a9dd586
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/include/hal_data.h
@@ -909806,7 +909806,7 @@ index 0000000..a9dd586
 +
 +#endif /* __HAL_DATA_H__ */
 diff --git a/drivers/net/wireless/rtl8814au/include/hal_data.h.edited b/drivers/net/wireless/rtl8814au/include/hal_data.h.edited
-new file mode 100755
+new file mode 100644
 index 0000000..ec59ebb
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/include/hal_data.h.edited
@@ -924745,7 +924745,7 @@ index 0000000..a3bb7df
 +
 +#endif
 diff --git a/drivers/net/wireless/rtl8814au/include/rtl8723b_hal.h b/drivers/net/wireless/rtl8814au/include/rtl8723b_hal.h
-new file mode 100755
+new file mode 100644
 index 0000000..e6391a4
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/include/rtl8723b_hal.h
@@ -925049,7 +925049,7 @@ index 0000000..e6391a4
 +
 +#endif
 diff --git a/drivers/net/wireless/rtl8814au/include/rtl8723b_led.h b/drivers/net/wireless/rtl8814au/include/rtl8723b_led.h
-new file mode 100755
+new file mode 100644
 index 0000000..0a7b2c9
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/include/rtl8723b_led.h
@@ -925103,7 +925103,7 @@ index 0000000..0a7b2c9
 +
 +#endif
 diff --git a/drivers/net/wireless/rtl8814au/include/rtl8723b_recv.h b/drivers/net/wireless/rtl8814au/include/rtl8723b_recv.h
-new file mode 100755
+new file mode 100644
 index 0000000..fd9faef
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/include/rtl8723b_recv.h
@@ -925236,7 +925236,7 @@ index 0000000..bf56dde
 +
 +#endif
 diff --git a/drivers/net/wireless/rtl8814au/include/rtl8723b_spec.h b/drivers/net/wireless/rtl8814au/include/rtl8723b_spec.h
-new file mode 100755
+new file mode 100644
 index 0000000..85b9d1e
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/include/rtl8723b_spec.h
@@ -925573,7 +925573,7 @@ index 0000000..8067359
 +#endif
 +#endif
 diff --git a/drivers/net/wireless/rtl8814au/include/rtl8723b_xmit.h b/drivers/net/wireless/rtl8814au/include/rtl8723b_xmit.h
-new file mode 100755
+new file mode 100644
 index 0000000..7cc33e1
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/include/rtl8723b_xmit.h
@@ -929367,7 +929367,7 @@ index 0000000..9fe4dfb
 +#include "rtl8821a_xmit.h"
 +#endif /* CONFIG_RTL8821A */
 diff --git a/drivers/net/wireless/rtl8814au/include/rtl8814a_cmd.h b/drivers/net/wireless/rtl8814au/include/rtl8814a_cmd.h
-new file mode 100755
+new file mode 100644
 index 0000000..e2e0236
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/include/rtl8814a_cmd.h
@@ -929565,7 +929565,7 @@ index 0000000..bb925e4
 +
 +#endif
 diff --git a/drivers/net/wireless/rtl8814au/include/rtl8814a_hal.h b/drivers/net/wireless/rtl8814au/include/rtl8814a_hal.h
-new file mode 100755
+new file mode 100644
 index 0000000..a2846bb
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/include/rtl8814a_hal.h
@@ -929942,7 +929942,7 @@ index 0000000..1137a9b
 +
 +#endif /* __RTL8814A_LED_H__ */
 diff --git a/drivers/net/wireless/rtl8814au/include/rtl8814a_recv.h b/drivers/net/wireless/rtl8814au/include/rtl8814a_recv.h
-new file mode 100755
+new file mode 100644
 index 0000000..e9626f3
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/include/rtl8814a_recv.h
@@ -930178,7 +930178,7 @@ index 0000000..7b11d99
 +
 +#endif/* __RTL8188E_RF_H__ */
 diff --git a/drivers/net/wireless/rtl8814au/include/rtl8814a_spec.h b/drivers/net/wireless/rtl8814au/include/rtl8814a_spec.h
-new file mode 100755
+new file mode 100644
 index 0000000..43a6381
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/include/rtl8814a_spec.h
@@ -930870,7 +930870,7 @@ index 0000000..5d95e1f
 +#endif
 +#endif
 diff --git a/drivers/net/wireless/rtl8814au/include/rtl8814a_xmit.h b/drivers/net/wireless/rtl8814au/include/rtl8814a_xmit.h
-new file mode 100755
+new file mode 100644
 index 0000000..099760d
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/include/rtl8814a_xmit.h
@@ -932071,7 +932071,7 @@ index 0000000..089f97d
 +
 +#endif /* _RTL8822B_HAL_H_ */
 diff --git a/drivers/net/wireless/rtl8814au/include/rtl8822be_hal.h b/drivers/net/wireless/rtl8814au/include/rtl8822be_hal.h
-new file mode 100755
+new file mode 100644
 index 0000000..8379fab
 --- /dev/null
 +++ b/drivers/net/wireless/rtl8814au/include/rtl8822be_hal.h
--- a/patch/kernel/mvebu64-dev/0008-PCI-aardvark-set-host-and-device-to-the-same-MAX-pay.patch
+++ b/patch/kernel/mvebu64-dev/0008-PCI-aardvark-set-host-and-device-to-the-same-MAX-pay.patch
@@ -1,123 +0,0 @@
-From 6ce52078a28550c7103b79b2b26de08185035bda Mon Sep 17 00:00:00 2001
-From: Victor Gu <xigu@marvell.com>
-Date: Fri, 8 Sep 2017 11:53:44 +0200
-Subject: [PATCH 08/12] PCI: aardvark: set host and device to the same MAX
- payload size
-
-Since the Aardvark does not implement a PCIe root bus, the Linux PCIe
-subsystem will not align the MAX payload size between the host and the
-device. This patch ensures that the host and device have the same MAX
-payload size, fixing a number of problems with various PCIe devices.
-
-This is part of fixing bug
-https://bugzilla.kernel.org/show_bug.cgi?id=196339, this commit was
-reported as the user to be important to get a Intel 7260 mini-PCIe
-WiFi card working.
-
-Fixes: Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver")
-Signed-off-by: Victor Gu <xigu@marvell.com>
-Reviewed-by: Evan Wang <xswang@marvell.com>
-Reviewed-by: Nadav Haklai <nadavh@marvell.com>
-[Thomas: tweak commit log.]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
- drivers/pci/host/pci-aardvark.c | 60 ++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 59 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c
-index 68ff10e17c74..e361c673732f 100644
--- a/drivers/pci/host/pci-aardvark.c
-+++ b/drivers/pci/host/pci-aardvark.c
-@@ -27,8 +27,10 @@
- #define PCIE_CORE_DEV_CTRL_STATS_REG				0xc8
- #define     PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE	(0 << 4)
- #define     PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ_SHIFT	5
-+#define     PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ		0x2
- #define     PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE		(0 << 11)
- #define     PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT	12
-+#define     PCIE_CORE_MPS_UNIT_BYTE				128
- #define     PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SZ		0x2
- #define PCIE_CORE_LINK_CTRL_STAT_REG				0xd0
- #define     PCIE_CORE_LINK_L0S_ENTRY				BIT(0)
-@@ -298,7 +300,8 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie)
- 
- 	/* Set PCIe Device Control and Status 1 PF0 register */
- 	reg = PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE |
-		(7 << PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ_SHIFT) |
-+		(PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ <<
-+		 PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ_SHIFT) |
- 		PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE |
- 		PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT;
- 	advk_writel(pcie, reg, PCIE_CORE_DEV_CTRL_STATS_REG);
-@@ -880,6 +883,58 @@ static int advk_pcie_parse_request_of_pci_ranges(struct advk_pcie *pcie)
- 	return err;
- }
- 
-+static int advk_pcie_find_smpss(struct pci_dev *dev, void *data)
-+{
-+	u8 *smpss = data;
-+
-+	if (!dev)
-+		return 0;
-+
-+	if (!pci_is_pcie(dev))
-+		return 0;
-+
-+	if (*smpss > dev->pcie_mpss)
-+		*smpss = dev->pcie_mpss;
-+
-+	return 0;
-+}
-+
-+static int advk_pcie_bus_configure_mps(struct pci_dev *dev, void *data)
-+{
-+	int mps;
-+
-+	if (!dev)
-+		return 0;
-+
-+	if (!pci_is_pcie(dev))
-+		return 0;
-+
-+	mps = PCIE_CORE_MPS_UNIT_BYTE << *(u8 *)data;
-+	pcie_set_mps(dev, mps);
-+
-+	return 0;
-+}
-+
-+static void advk_pcie_configure_mps(struct pci_bus *bus, struct advk_pcie *pcie)
-+{
-+	u8 smpss = PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ;
-+	u32 reg;
-+
-+	/* Find the minimal supported MAX payload size */
-+	advk_pcie_find_smpss(bus->self, &smpss);
-+	pci_walk_bus(bus, advk_pcie_find_smpss, &smpss);
-+
-+	/* Configure RC MAX payload size */
-+	reg = advk_readl(pcie, PCIE_CORE_DEV_CTRL_STATS_REG);
-+	reg &= ~PCI_EXP_DEVCTL_PAYLOAD;
-+	reg |= smpss << PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ_SHIFT;
-+	advk_writel(pcie, reg, PCIE_CORE_DEV_CTRL_STATS_REG);
-+
-+	/* Configure device MAX payload size */
-+	advk_pcie_bus_configure_mps(bus->self, &smpss);
-+	pci_walk_bus(bus, advk_pcie_bus_configure_mps, &smpss);
-+}
-+
- static int advk_pcie_probe(struct platform_device *pdev)
- {
- 	struct device *dev = &pdev->dev;
-@@ -951,6 +1006,9 @@ static int advk_pcie_probe(struct platform_device *pdev)
- 	list_for_each_entry(child, &bus->children, node)
- 		pcie_bus_configure_settings(child);
- 
-+	/* Configure the MAX pay load size */
-+	advk_pcie_configure_mps(bus, pcie);
-+
- 	pci_bus_add_devices(bus);
- 	return 0;
- }
-- 
-2.14.1
-
--- a/patch/kernel/mvebu64-dev/0008-fix-pci-aardvark-disable-LOS-state-by-default.patch
+++ b/patch/kernel/mvebu64-dev/0008-fix-pci-aardvark-disable-LOS-state-by-default.patch
@@ -1,35 +0,0 @@
-From c1d0aadc4440c07d2e940c83c1b6e5d9d694a3a5 Mon Sep 17 00:00:00 2001
-From: Victor Gu <xigu@marvell.com>
-Date: Wed, 29 Mar 2017 15:17:03 +0800
-Subject: [PATCH 08/11] fix: pci: aardvark: disable LOS state by default
-
-Some PCIe devices do not support LOS, there will be time out issue
-if the RC forces the LOS state.
-This patch disables the LOS state by default.
-
-Change-Id: I88a6a5cf58ea5f2df234c99050ce041987cdabc6
-Signed-off-by: Victor Gu <xigu@marvell.com>
-Reviewed-on: http://vgitil04.il.marvell.com:8080/38119
-Tested-by: iSoC Platform CI <ykjenk@marvell.com>
-Reviewed-by: Evan Wang <xswang@marvell.com>
---
- drivers/pci/host/pci-aardvark.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c
-index 37d0bcd31f8a..072bc70e900c 100644
--- a/drivers/pci/host/pci-aardvark.c
-+++ b/drivers/pci/host/pci-aardvark.c
-@@ -365,8 +365,7 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie)
- 
- 	advk_pcie_wait_for_link(pcie);
- 
-	reg = PCIE_CORE_LINK_L0S_ENTRY |
-		(1 << PCIE_CORE_LINK_WIDTH_SHIFT);
-+	reg = (1 << PCIE_CORE_LINK_WIDTH_SHIFT);
- 	advk_writel(pcie, reg, PCIE_CORE_LINK_CTRL_STAT_REG);
- 
- 	reg = advk_readl(pcie, PCIE_CORE_CMD_STATUS_REG);
-- 
-2.13.3
-
--- a/patch/kernel/mvebu64-dev/enable_ath10_cards.patch
+++ b/patch/kernel/mvebu64-dev/enable_ath10_cards.patch
@@ -1,16 +0,0 @@
-diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c
-index a42a040..1754456
--- a/drivers/pci/host/pci-aardvark.c
-+++ b/drivers/pci/host/pci-aardvark.c
-@@ -312,9 +312,10 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie)
- 	advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
- 
- 	/* Set GEN2 */
-+	/* Set GEN1 */
- 	reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
- 	reg &= ~PCIE_GEN_SEL_MSK;
-	reg |= SPEED_GEN_2;
-+	reg |= SPEED_GEN_1;
- 	advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
- 
- 	/* Set lane X1 */
--- a/patch/kernel/mvebu64-next/0001-aufs4.16-20180409.patch
+++ b/patch/kernel/mvebu64-next/0001-aufs4.16-20180409.patch
--- a/patch/kernel/mvebu64-next/bash_to_afterinstall.patch
+++ b/patch/kernel/mvebu64-next/bash_to_afterinstall.patch
@@ -1,11 +0,0 @@
--- a/scripts/package/builddeb
-+++ b/scripts/package/builddeb
-@@ -218,7 +218,7 @@
- for script in postinst postrm preinst prerm ; do
- 	mkdir -p "$tmpdir$debhookdir/$script.d"
- 	cat <<EOF > "$tmpdir/DEBIAN/$script"
-#!/bin/sh
-+#!/bin/bash
- 
- set -e
- 
--- a/patch/kernel/mvebu64-next/general-aufs4.17-20180611.patch
+++ b/patch/kernel/mvebu64-next/general-aufs4.17-20180611.patch
--- a/patch/kernel/mvebu64-next/general-increasing_DMA_block_memory_allocation_to_2048.patch
+++ b/patch/kernel/mvebu64-next/general-increasing_DMA_block_memory_allocation_to_2048.patch
@@ -11,3 +11,17 @@ index 3216e09..21bce28
 static size_t atomic_pool_size __initdata = DEFAULT_DMA_COHERENT_POOL_SIZE;

 static int __init early_coherent_pool(char *p)
+
+diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
+index ada8eb2..8df220f
+--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
+@@ -381,7 +381,7 @@ static void __dma_free_remap(void *cpu_addr, size_t size)
+ 			VM_ARM_DMA_CONSISTENT | VM_USERMAP);
+ }
+
+-#define DEFAULT_DMA_COHERENT_POOL_SIZE	SZ_256K
+#define DEFAULT_DMA_COHERENT_POOL_SIZE	SZ_2M
+ static struct gen_pool *atomic_pool __ro_after_init;
+
+ static size_t atomic_pool_size __initdata = DEFAULT_DMA_COHERENT_POOL_SIZE;
--- a/patch/kernel/mvebu64-next/packaging-4.x-NEXT-with-postinstall-scripts.patch
+++ b/patch/kernel/mvebu64-next/packaging-4.x-NEXT-with-postinstall-scripts.patch
@@ -1,8 +1,8 @@
 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 1845c5d..9dab810 100755
+index 90c9a8a..3c79b90 100755
 --- a/scripts/package/builddeb
 +++ b/scripts/package/builddeb
-@@ -29,6 +29,28 @@ create_package() {
+@@ -29,6 +29,27 @@ create_package() {
 	# in case we are in a restrictive umask environment like 0077
 	chmod -R a+rX "$pdir"
 
@@ -10,56 +10,69 @@ index 1845c5d..9dab810 100755
 +	if [[ "$1" == *dtb* ]]; then
 +		echo "if [ -d /boot/dtb-$version ]; then mv /boot/dtb-$version /boot/dtb-$version.old; fi" >> $pdir/DEBIAN/preinst
 +		echo "if [ -d /boot/dtb.old ]; then rm -rf /boot/dtb.old; fi" >> $pdir/DEBIAN/preinst
-+		echo "if [ -d /dtb ]; then mv /dtb /dtb.old; fi" >> $pdir/DEBIAN/preinst
 +		echo "if [ -d /boot/dtb ]; then mv /boot/dtb /boot/dtb.old; fi" >> $pdir/DEBIAN/preinst
 +		echo "exit 0" >> $pdir/DEBIAN/preinst
 +		chmod 775 $pdir/DEBIAN/preinst
-+		#
+
 +		echo "if [ -d /boot/dtb-$version.old ]; then rm -rf /boot/dtb-$version.old; fi" >> $pdir/DEBIAN/postinst
 +		echo "ln -sf dtb-$version /boot/dtb > /dev/null 2>&1 || mv /boot/dtb-$version /boot/dtb" >> $pdir/DEBIAN/postinst
 +		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-gencontrol -p$pname -P"$pdir"
 	dpkg --build "$pdir" ..
-@@ -94,10 +116,13 @@ sourcename=$KDEB_SOURCENAME
- tmpdir="$objtree/debian/tmp"
+@@ -39,9 +60,11 @@ tmpdir="$objtree/debian/tmp"
 kernel_headers_dir="$objtree/debian/hdrtmp"
 libc_headers_dir="$objtree/debian/headertmp"
-+dtb_dir="$objtree/debian/dtbtmp"
 dbg_dir="$objtree/debian/dbgtmp"
 -packagename=linux-image-$version
 -kernel_headers_packagename=linux-headers-$version
 -libc_headers_packagename=linux-libc-dev
+dtb_dir="$objtree/debian/dtbtmp"
 +packagename=linux-image-next"$LOCALVERSION"
-+fwpackagename=linux-firmware-image-next"$LOCALVERSION"
 +kernel_headers_packagename=linux-headers-next"$LOCALVERSION"
 +dtb_packagename=linux-dtb-next"$LOCALVERSION"
 +libc_headers_packagename=linux-libc-dev-next"$LOCALVERSION"
 dbg_packagename=$packagename-dbg
- debarch=
- forcearch=
-@@ -124,7 +149,9 @@ esac
+ 
+ if [ "$ARCH" = "um" ] ; then
+@@ -52,6 +75,15 @@ fi
+ # XXX: have each arch Makefile export a variable of the canonical image install
+ # path instead
+ case $ARCH in
+aarch64|arm64)
+	image_name=Image
+	installed_image_path="boot/vmlinuz-$version"
+
+	;;
+arm*)
+	image_name=zImage
+	installed_image_path="boot/vmlinuz-$version"
+	;;
+ um)
+ 	installed_image_path="usr/bin/linux-$version"
+ 	;;
+@@ -65,7 +97,9 @@ esac
 BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
 
 # Setup the directory structure
 -rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
-+rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir" $objtree/debian/files
+rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$dtb_dir" $objtree/debian/files
 +mkdir -m 755 -p "$dtb_dir/DEBIAN"
 +mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
 mkdir -m 755 -p "$tmpdir/DEBIAN"
 mkdir -p "$tmpdir/lib" "$tmpdir/boot"
 mkdir -p "$kernel_headers_dir/lib/modules/$version/"
-@@ -177,6 +204,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
+@@ -118,6 +152,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
 	fi
 fi
 
@@ -71,28 +84,16 @@ index 1845c5d..9dab810 100755
 if [ "$ARCH" != "um" ]; then
 	$MAKE headers_check KBUILD_SRC=
 	$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
-@@ -189,7 +221,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
-@@ -201,9 +233,11 @@ for script in postinst postrm preinst prerm ; do
+@@ -137,7 +176,7 @@ fi
+ for script in postinst postrm preinst prerm ; do
+ 	mkdir -p "$tmpdir$debhookdir/$script.d"
+ 	cat <<EOF > "$tmpdir/DEBIAN/$script"
+-#!/bin/sh
+#!/bin/bash
+ 
 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
-@@ -212,6 +246,55 @@ EOF
+@@ -153,9 +192,60 @@ EOF
 	chmod 755 "$tmpdir/DEBIAN/$script"
 done
 
@@ -101,97 +102,120 @@ index 1845c5d..9dab810 100755
 +##
 +sed -e "s/set -e//g" -i $tmpdir/DEBIAN/postinst
 +sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
-+cat >> $tmpdir/DEBIAN/postinst <<EOT 
+cat >> $tmpdir/DEBIAN/postinst <<EOT
 +if [ "\$(grep nand /proc/partitions)" != "" ] && [ "\$(grep mmc /proc/partitions)" = "" ]; then
-+mkimage -A arm -O linux -T kernel -C none -a "0x40008000" -e "0x40008000" -n "Linux kernel" -d /$installed_image_path /boot/uImage  > /dev/null 2>&1
-+cp /boot/uImage /tmp/uImage
-+sync
-+mountpoint -q /boot || mount /boot
-+cp /tmp/uImage /boot/uImage
-+rm -f /$installed_image_path
+	mkimage -A arm -O linux -T kernel -C none -a "0x40008000" -e "0x40008000" -n "Linux kernel" -d /$installed_image_path /boot/uImage  > /dev/null 2>&1
+	cp /boot/uImage /tmp/uImage
+	sync
+	mountpoint -q /boot || mount /boot
+	cp /tmp/uImage /boot/uImage
+	rm -f /$installed_image_path
 +else
-+ln -sf $(basename $installed_image_path) /boot/zImage > /dev/null 2>&1 || mv /$installed_image_path /boot/zImage
+	ln -sf $(basename $installed_image_path) /boot/$image_name || mv /$installed_image_path /boot/$image_name
 +fi
 +touch /boot/.next
 +exit 0
 +EOT
+
 +##
 +## FAT install workaround
 +##
 +sed -e "s/set -e//g" -i $tmpdir/DEBIAN/preinst
 +sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst
-+cat >> $tmpdir/DEBIAN/preinst <<EOT 
+cat >> $tmpdir/DEBIAN/preinst <<EOT
 +# exit if we are running chroot
 +if [ "\$(stat -c %d:%i /)" != "\$(stat -c %d:%i /proc/1/root/.)" ]; then exit 0; fi
 +
 +check_and_unmount (){
-+boot_device=\$(mountpoint -d /boot)
+	boot_device=\$(mountpoint -d /boot)
 +
-+for file in /dev/* ; do
-+	CURRENT_DEVICE=\$(printf "%d:%d" \$(stat --printf="0x%t 0x%T" \$file))
-+	if [[ "\$CURRENT_DEVICE" = "\$boot_device" ]]; then
-+		boot_partition=\$file
-+		break;
+	for file in /dev/* ; do
+		CURRENT_DEVICE=\$(printf "%d:%d" \$(stat --printf="0x%t 0x%T" \$file))
+		if [[ "\$CURRENT_DEVICE" = "\$boot_device" ]]; then
+			boot_partition=\$file
+			break
+		fi
+	done
+
+	bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
+	if [ "\$bootfstype" = "vfat" ]; then
+		umount /boot
+		rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/$image_name /boot/uImage
 +	fi
-+done
-+
-+bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
-+if [ "\$bootfstype" = "vfat" ]; then 
-+umount /boot; 
-+rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/zImage /boot/uImage
-+fi
 +}
 +mountpoint -q /boot && check_and_unmount
 +EOT
-+echo "exit 0" >> $tmpdir/DEBIAN/preinst 
+echo "exit 0" >> $tmpdir/DEBIAN/preinst
 +
- # Try to determine maintainer and email values
- if [ -n "$DEBEMAIL" ]; then
-        email=$DEBEMAIL
-@@ -325,12 +408,20 @@ if grep -q '^CONFIG_GCC_PLUGINS=y' $KCONFIG_CONFIG ; then
+ # Build kernel header package
+ (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
+ (cd $srctree; find arch/*/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
+(cd $srctree; find security/*/include -type f) >> "$objtree/debian/hdrsrcfiles"
+ (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
+ (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
+ if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then
+@@ -167,15 +257,19 @@ 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
-@@ -343,6 +434,16 @@ EOF
- 
- cat <<EOF >> debian/control
- 
-+Package: $dtb_packagename
-+Architecture: any
-+Description: Linux DTB, version $version
-+ This package contains device blobs from the Linux kernel, version $version.
-+EOF
-+
-+create_package "$dtb_packagename" "$dtb_dir"
-+
-+cat <<EOF >> debian/control
-+
- Package: $libc_headers_packagename
- Section: devel
- Provides: linux-kernel-headers
-@@ -354,7 +455,7 @@ EOF
- 
 if [ "$ARCH" != "um" ]; then
 	create_package "$kernel_headers_packagename" "$kernel_headers_dir"
 -	create_package "$libc_headers_packagename" "$libc_headers_dir"
-+#	create_package "$libc_headers_packagename" "$libc_headers_dir"
+	# create_package "$libc_headers_packagename" "$libc_headers_dir"
+	create_package "$dtb_packagename" "$dtb_dir"
 fi
 
 create_package "$packagename" "$tmpdir"
+diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
+index 6adb3a1..00e12eb 100755
+--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
+@@ -61,10 +61,12 @@ else
+ 	packageversion=$version-$revision
+ fi
+ sourcename=$KDEB_SOURCENAME
+-packagename=linux-image-$version
+-kernel_headers_packagename=linux-headers-$version
+packagename=linux-image-next$LOCALVERSION
+kernel_headers_packagename=linux-headers-next$LOCALVERSION
+dtb_packagename=linux-dtb-next$LOCALVERSION
+ dbg_packagename=$packagename-dbg
+ debarch=
+image_name=
+ set_debarch
+ 
+ if [ "$ARCH" = "um" ] ; then
+@@ -168,6 +170,11 @@ Architecture: $debarch
+ Description: Linux kernel debugging symbols for $version
+  This package will come in handy if you need to debug the kernel. It provides
+  all the necessary debug symbols for the kernel and its modules.
+
+Package: $dtb_packagename
+Architecture: $debarch
+Description: Linux DTB, version $version
+ This package contains device blobs from the Linux kernel, version $version
+ EOF
+ 
+ cat <<EOF > debian/rules
+diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
+index f839ecd9..cd276162 100644
+--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
+@@ -103,7 +103,7 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
+ 
+ # Default target when executing plain make
+ boot		:= arch/arm64/boot
+-KBUILD_IMAGE	:= $(boot)/Image.gz
+KBUILD_IMAGE	:= $(boot)/Image
+ KBUILD_DTBS	:= dtbs
+ 
+ all:	Image.gz $(KBUILD_DTBS)
--- a/patch/kernel/mvebu64-next/set-default-target-to-Image.patch
+++ b/patch/kernel/mvebu64-next/set-default-target-to-Image.patch
@@ -1,13 +0,0 @@
-diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
-index f839ecd9..cd276162 100644
--- a/arch/arm64/Makefile
-+++ b/arch/arm64/Makefile
-@@ -103,7 +103,7 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
- 
- # Default target when executing plain make
- boot		:= arch/arm64/boot
-KBUILD_IMAGE	:= $(boot)/Image.gz
-+KBUILD_IMAGE	:= $(boot)/Image
- KBUILD_DTBS	:= dtbs
- 
- all:	Image.gz $(KBUILD_DTBS)
--- a/patch/kernel/mvebu64-next/zImage_to_Image.patch
+++ b/patch/kernel/mvebu64-next/zImage_to_Image.patch
@@ -1,50 +0,0 @@
-diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 0f8de20..3a39d73 100755
--- a/scripts/package/builddeb
-+++ b/scripts/package/builddeb
-@@ -251,7 +251,7 @@ done
- ##
- sed -e "s/set -e//g" -i $tmpdir/DEBIAN/postinst
- sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
-cat >> $tmpdir/DEBIAN/postinst <<EOT 
-+cat >> $tmpdir/DEBIAN/postinst <<EOT
- if [ "\$(grep nand /proc/partitions)" != "" ] && [ "\$(grep mmc /proc/partitions)" = "" ]; then
- mkimage -A arm -O linux -T kernel -C none -a "0x40008000" -e "0x40008000" -n "Linux kernel" -d /$installed_image_path /boot/uImage  > /dev/null 2>&1
- cp /boot/uImage /tmp/uImage
-@@ -260,7 +260,7 @@ mountpoint -q /boot || mount /boot
- cp /tmp/uImage /boot/uImage
- rm -f /$installed_image_path
- else
-ln -sf $(basename $installed_image_path) /boot/zImage > /dev/null 2>&1 || mv /$installed_image_path /boot/zImage
-+ln -sf $(basename $installed_image_path) /boot/Image > /dev/null 2>&1 || mv /$installed_image_path /boot/Image
- fi
- touch /boot/.next
- exit 0
-@@ -270,7 +270,7 @@ EOT
- ##
- sed -e "s/set -e//g" -i $tmpdir/DEBIAN/preinst
- sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst
-cat >> $tmpdir/DEBIAN/preinst <<EOT 
-+cat >> $tmpdir/DEBIAN/preinst <<EOT
- # exit if we are running chroot
- if [ "\$(stat -c %d:%i /)" != "\$(stat -c %d:%i /proc/1/root/.)" ]; then exit 0; fi
- 
-@@ -286,14 +286,14 @@ for file in /dev/* ; do
- done
- 
- bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
-if [ "\$bootfstype" = "vfat" ]; then 
-umount /boot; 
-rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/zImage /boot/uImage
-+if [ "\$bootfstype" = "vfat" ]; then
-+umount /boot;
-+rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/Image /boot/uImage
- fi
- }
- mountpoint -q /boot && check_and_unmount
- EOT
-echo "exit 0" >> $tmpdir/DEBIAN/preinst 
-+echo "exit 0" >> $tmpdir/DEBIAN/preinst
- 
- # Try to determine maintainer and email values
- if [ -n "$DEBEMAIL" ]; then