core/linux-kirkwood to 4.3.0-1

2024-11-08 22:45:43 +00:00 · 2015-11-28 06:14:37 +00:00 · 2015-11-28 06:14:37 +00:00 · 6022aff74f
commit 6022aff74f
parent 6696d24d0f
6 changed files with 234 additions and 206 deletions
--- a/core/linux-kirkwood/PKGBUILD
+++ b/core/linux-kirkwood/PKGBUILD
@ -6,10 +6,10 @@ buildarch=2
 pkgbase=linux-kirkwood
 _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood"
-pkgver=4.2.6
+pkgver=4.3.0
 srcver=${pkgver%.0}
 pkgrel=1
-cryptodev_commit=da730106c2558c8e0c8e1b1b1812d32ef9574ab7
+cryptodev_commit=bc67142c57eadc0aafd0323ec527849012786643
 bfqver=v7r8

 ### BFQ patch kernel version
@ -30,25 +30,25 @@ source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz"
        'archlinuxarm.patch'
        'config'
        'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
-        'usb-add-reset-resume-quirk-for-several-webcams.patch'
 	'0001-disable-mv643xx_eth-TSO.patch'
        "git+https://github.com/sfjro/aufs4-standalone.git#branch=${aufsbranch}"
        "cryptodev-${cryptodev_commit}.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz"
        "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.patch"
        "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch"
-        "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch")
+        "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch"
+        'linux.preset')

-md5sums=('209a610aec55df6ad0d3ceefc03a64f8'
-         '777d455648bd9d6017bc2620347596e8'
-         'e7a013ebbcc2a0665404d1e698547f80'
+md5sums=('58b35794eee3b6d52ce7be39357801e7'
+         'b91129f87c799e7184c00257eeddd2f2'
+         'cfae749ec27515f0f5b4bb3fc3b7e885'
         '5faf5d5f9aadf621942bd03c3b993947'
-         '9b5a265440abf57d2052838f31486a3a'
         '09d44b9f07abfaeaf4f688ee52034786'
         'SKIP'
-         '8fb4d3b7cc970351f3b5078b7893a107'
-         '82160f921c074b79a64a71b8d8945b06'
-         'd84e9d42dd3378d80af10120806609f7'
-         'b40833e6852e4c4c622836fe05dc6c71')
+         '2c8ecae91223868decdf37b8a76489b7'
+         'c075ad682894b99fcc0f8b5bdc5b8b1b'
+         '5d346d74dce5ea4aafc2af55bdf1e961'
+         '69e80fbf2e272c94fc10435ebb2dd022'
+         '6d8c200779cbdef582e9e435ed86ca31')

 prepare() {
  cd "${srcdir}/linux-${srcver}"
@ -67,10 +67,6 @@ prepare() {
  msg2 "http://archlinuxarm.org/forum/viewtopic.php?f=9&t=7692"
  patch -Np1 -i ${srcdir}/0001-disable-mv643xx_eth-TSO.patch

-  msg2 "Add the USB_QUIRK_RESET_RESUME for several webcams"
-  # FS#26528
-  patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
-
  msg2 "Add Arch Linux ARM patch for ARMv5te plug computers, mach-types"
  patch -Np1 -i "${srcdir}/archlinuxarm.patch"
  cp "${srcdir}/mach-types" arch/arm/tools
@ -129,6 +125,7 @@ _package() {
  optdepends=('crda: to set the correct wireless channels of your country')
  provides=('kernel26' 'linux=${pkgver}' 'aufs_friendly' 'cryptodev_friendly')
  conflicts=('linux-kirkwood-dt' 'linux' 'linux-olinuxino')
+  backup=("etc/mkinitcpio.d/${pkgbase}.preset")
  install=${pkgname}.install

  cd "${srcdir}/linux-${srcver}"
@ -151,6 +148,13 @@ _package() {
    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
    -i "${startdir}/${pkgname}.install"

+  # install mkinitcpio preset file for kernel
+  install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+  sed \
+    -e "1s|'linux.*'|'${pkgbase}'|" \
+    -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \
+    -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+
  # remove build and source links
  rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
  # remove the firmware
--- a/core/linux-kirkwood/archlinuxarm.patch
+++ b/core/linux-kirkwood/archlinuxarm.patch
@ -1,7 +1,7 @@
 diff -ruN a/arch/arm/Kconfig b/arch/arm/Kconfig
--- a/arch/arm/Kconfig	2015-04-12 22:12:50.000000000 +0000
-+++ b/arch/arm/Kconfig	2015-04-15 06:07:27.122964189 +0000
-@@ -524,6 +524,21 @@
+--- a/arch/arm/Kconfig	2015-11-02 00:05:25.000000000 +0000
+++ b/arch/arm/Kconfig	2015-11-27 18:42:18.297279720 +0000
+@@ -517,6 +517,21 @@
 	help
 	  Support for the Marvell Dove SoC 88AP510
 
@ -23,7 +23,7 @@ diff -ruN a/arch/arm/Kconfig b/arch/arm/Kconfig
 config ARCH_MV78XX0
 	bool "Marvell MV78xx0"
 	select ARCH_REQUIRE_GPIOLIB
-@@ -887,6 +902,8 @@
+@@ -874,6 +889,8 @@
 
 source "arch/arm/mach-keystone/Kconfig"
 
@ -33,9 +33,9 @@ diff -ruN a/arch/arm/Kconfig b/arch/arm/Kconfig
 
 source "arch/arm/mach-meson/Kconfig"
 diff -ruN a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
--- a/arch/arm/Kconfig.debug	2015-04-12 22:12:50.000000000 +0000
-+++ b/arch/arm/Kconfig.debug	2015-04-15 06:12:21.985188847 +0000
-@@ -1329,7 +1329,7 @@
+--- a/arch/arm/Kconfig.debug	2015-11-02 00:05:25.000000000 +0000
+++ b/arch/arm/Kconfig.debug	2015-11-27 18:42:18.297279720 +0000
+@@ -1371,7 +1371,7 @@
 	def_bool ARCH_DOVE || ARCH_EBSA110 || \
 		(FOOTBRIDGE && !DEBUG_DC21285_PORT) || \
 		ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \
@ -44,7 +44,7 @@ diff -ruN a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
 		ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC
 
 # Compatibility options for BCM63xx
-@@ -1411,7 +1411,7 @@
+@@ -1454,7 +1454,7 @@
 	default 0xf040ab00 if DEBUG_BRCMSTB_UART
 	default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE
 	default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE
@ -53,7 +53,7 @@ diff -ruN a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
 				ARCH_ORION5X
 	default 0xf7fc9000 if DEBUG_BERLIN_UART
 	default 0xf8b00000 if DEBUG_HIX5HD2_UART
-@@ -1507,6 +1507,7 @@
+@@ -1554,6 +1554,7 @@
 	default 0xfec90000 if DEBUG_RK32_UART2
 	default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
 	default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
@ -62,19 +62,19 @@ diff -ruN a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
 	default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
 	default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
 diff -ruN a/arch/arm/Makefile b/arch/arm/Makefile
--- a/arch/arm/Makefile	2015-04-12 22:12:50.000000000 +0000
-+++ b/arch/arm/Makefile	2015-04-15 06:07:27.133964937 +0000
-@@ -166,6 +166,7 @@
+--- a/arch/arm/Makefile	2015-11-02 00:05:25.000000000 +0000
+++ b/arch/arm/Makefile	2015-11-27 18:42:18.297279720 +0000
+@@ -178,6 +178,7 @@
 machine-$(CONFIG_ARCH_IOP33X)		+= iop33x
 machine-$(CONFIG_ARCH_IXP4XX)		+= ixp4xx
 machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone
 +machine-$(CONFIG_ARCH_KIRKWOOD)         += kirkwood
 machine-$(CONFIG_ARCH_KS8695)		+= ks8695
+ machine-$(CONFIG_ARCH_LPC18XX)		+= lpc18xx
 machine-$(CONFIG_ARCH_LPC32XX)		+= lpc32xx
- machine-$(CONFIG_ARCH_MESON)		+= meson
 diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 --- a/arch/arm/mach-kirkwood/Kconfig	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/Kconfig	2015-04-15 06:07:27.136965141 +0000
+++ b/arch/arm/mach-kirkwood/Kconfig	2015-11-27 18:42:18.302279708 +0000
@@ -0,0 +1,258 @@
 +if ARCH_KIRKWOOD
 +
@ -336,7 +336,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 +endif
 diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
 --- a/arch/arm/mach-kirkwood/Makefile	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/Makefile	2015-04-15 06:07:27.137965209 +0000
+++ b/arch/arm/mach-kirkwood/Makefile	2015-11-27 18:42:18.302279708 +0000
@@ -0,0 +1,35 @@
 +obj-$(CONFIG_KIRKWOOD_LEGACY)	+= irq.o mpp.o common.o pcie.o
 +obj-$(CONFIG_PM)		+= pm.o
@ -375,14 +375,14 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
 +obj-$(CONFIG_ARCH_KIRKWOOD_DT)		+= board-dt.o
 diff -ruN a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot
 --- a/arch/arm/mach-kirkwood/Makefile.boot	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/Makefile.boot	2015-04-15 06:07:27.138965277 +0000
+++ b/arch/arm/mach-kirkwood/Makefile.boot	2015-11-27 18:42:18.302279708 +0000
@@ -0,0 +1,3 @@
 +   zreladdr-y	+= 0x00008000
 +params_phys-y	:= 0x00000100
 +initrd_phys-y	:= 0x00800000
 diff -ruN a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
 --- a/arch/arm/mach-kirkwood/board-dt.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/board-dt.c	2015-04-15 06:07:27.141965481 +0000
+++ b/arch/arm/mach-kirkwood/board-dt.c	2015-11-27 18:42:18.302279708 +0000
@@ -0,0 +1,223 @@
 +/*
 + * Copyright 2012 (C), Jason Cooper <jason@lakedaemon.net>
@ -609,7 +609,7 @@ diff -ruN a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3-gpio.c
 --- a/arch/arm/mach-kirkwood/bubba3-gpio.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/bubba3-gpio.c	2015-04-15 06:07:27.144965685 +0000
+++ b/arch/arm/mach-kirkwood/bubba3-gpio.c	2015-11-27 18:42:18.307279697 +0000
@@ -0,0 +1,392 @@
 +/*
 + * Excito BUBBA|3 led driver.
@ -1005,7 +1005,7 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3
 +module_exit(bubba3_cleanup);
 diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba3-setup.c
 --- a/arch/arm/mach-kirkwood/bubba3-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/bubba3-setup.c	2015-04-15 06:07:27.146965822 +0000
+++ b/arch/arm/mach-kirkwood/bubba3-setup.c	2015-11-27 18:42:18.307279697 +0000
@@ -0,0 +1,234 @@
 +/*
 + * arch/arm/mach-kirkwood/bubba3-setup.c
@ -1243,8 +1243,8 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
 --- a/arch/arm/mach-kirkwood/common.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/common.c	2015-04-15 06:07:27.153966298 +0000
-@@ -0,0 +1,746 @@
+++ b/arch/arm/mach-kirkwood/common.c	2015-11-27 19:04:15.639271904 +0000
+@@ -0,0 +1,747 @@
 +/*
 + * arch/arm/mach-kirkwood/common.c
 + *
@ -1281,6 +1281,7 @@ diff -ruN a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
 +#include <linux/platform_data/usb-ehci-orion.h>
 +#include <plat/common.h>
 +#include <plat/time.h>
+#include <linux/clk.h>
 +#include <linux/platform_data/dma-mv_xor.h>
 +#include "common.h"
 +#include "pm.h"
@ -1993,7 +1994,7 @@ diff -ruN a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
 +}
 diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
 --- a/arch/arm/mach-kirkwood/common.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/common.h	2015-04-15 06:07:27.154966366 +0000
+++ b/arch/arm/mach-kirkwood/common.h	2015-11-27 18:42:18.312279685 +0000
@@ -0,0 +1,74 @@
 +/*
 + * arch/arm/mach-kirkwood/common.h
@ -2071,7 +2072,7 @@ diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2net_v2-setup.c
 --- a/arch/arm/mach-kirkwood/d2net_v2-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c	2015-04-15 06:07:27.157966570 +0000
+++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c	2015-11-27 18:42:18.312279685 +0000
@@ -0,0 +1,231 @@
 +/*
 + * arch/arm/mach-kirkwood/d2net_v2-setup.c
@ -2306,7 +2307,7 @@ diff -ruN a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2n
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
 --- a/arch/arm/mach-kirkwood/dockstar-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2015-04-15 06:07:27.158966638 +0000
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2015-11-27 18:42:18.312279685 +0000
@@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-kirkwood/dockstar-setup.c
@ -2425,7 +2426,7 @@ diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/goflexhome-setup.c
 --- a/arch/arm/mach-kirkwood/goflexhome-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2015-04-15 06:07:27.160966774 +0000
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2015-11-27 18:42:18.312279685 +0000
@@ -0,0 +1,124 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexhome-setup.c
@ -2553,7 +2554,7 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
 +
 diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/goflexnet-setup.c
 --- a/arch/arm/mach-kirkwood/goflexnet-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2015-04-15 06:07:27.162966910 +0000
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2015-11-27 18:42:18.312279685 +0000
@@ -0,0 +1,177 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexnet-setup.c
@ -2734,7 +2735,7 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
 +
 diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
 --- a/arch/arm/mach-kirkwood/guruplug-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2015-04-15 06:07:27.164967046 +0000
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2015-11-27 18:42:18.317279674 +0000
@@ -0,0 +1,228 @@
 +/*
 + * arch/arm/mach-kirkwood/guruplug-setup.c
@ -2966,7 +2967,7 @@ diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/iconnect-setup.c
 --- a/arch/arm/mach-kirkwood/iconnect-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/iconnect-setup.c	2015-04-15 06:07:27.167967250 +0000
+++ b/arch/arm/mach-kirkwood/iconnect-setup.c	2015-11-27 18:42:18.317279674 +0000
@@ -0,0 +1,204 @@
 +/*
 + * arch/arm/mach-kirkwood/iconnect-setup.c
@ -3174,7 +3175,7 @@ diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/ico
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h
 --- a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h	2015-04-15 06:07:27.168967318 +0000
+++ b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h	2015-11-27 18:42:18.317279674 +0000
@@ -0,0 +1,86 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/bridge-regs.h
@ -3264,7 +3265,7 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h b/arch/arm/mach-ki
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/include/mach/entry-macro.S b/arch/arm/mach-kirkwood/include/mach/entry-macro.S
 --- a/arch/arm/mach-kirkwood/include/mach/entry-macro.S	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/include/mach/entry-macro.S	2015-04-15 06:07:27.170967454 +0000
+++ b/arch/arm/mach-kirkwood/include/mach/entry-macro.S	2015-11-27 18:42:18.317279674 +0000
@@ -0,0 +1,34 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/entry-macro.S
@ -3302,7 +3303,7 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/entry-macro.S b/arch/arm/mach-ki
 +	.endm
 diff -ruN a/arch/arm/mach-kirkwood/include/mach/hardware.h b/arch/arm/mach-kirkwood/include/mach/hardware.h
 --- a/arch/arm/mach-kirkwood/include/mach/hardware.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/include/mach/hardware.h	2015-04-15 06:07:27.171967522 +0000
+++ b/arch/arm/mach-kirkwood/include/mach/hardware.h	2015-11-27 18:42:18.317279674 +0000
@@ -0,0 +1,14 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/hardware.h
@ -3320,7 +3321,7 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/hardware.h b/arch/arm/mach-kirkw
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h
 --- a/arch/arm/mach-kirkwood/include/mach/irqs.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/include/mach/irqs.h	2015-04-15 06:07:27.172967590 +0000
+++ b/arch/arm/mach-kirkwood/include/mach/irqs.h	2015-11-27 18:42:18.317279674 +0000
@@ -0,0 +1,65 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/irqs.h
@ -3389,7 +3390,7 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h
 --- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h	2015-04-15 06:07:27.174967726 +0000
+++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h	2015-11-27 18:42:18.322279662 +0000
@@ -0,0 +1,142 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/kirkwood.h
@ -3535,7 +3536,7 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkw
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/include/mach/uncompress.h b/arch/arm/mach-kirkwood/include/mach/uncompress.h
 --- a/arch/arm/mach-kirkwood/include/mach/uncompress.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/include/mach/uncompress.h	2015-04-15 06:07:27.175967794 +0000
+++ b/arch/arm/mach-kirkwood/include/mach/uncompress.h	2015-11-27 18:42:18.322279662 +0000
@@ -0,0 +1,46 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/uncompress.h
@ -3585,7 +3586,7 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/uncompress.h b/arch/arm/mach-kir
 +#define arch_decomp_setup()
 diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwood/ionics-stratus-setup.c
 --- a/arch/arm/mach-kirkwood/ionics-stratus-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c	2015-04-15 06:07:27.177967930 +0000
+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c	2015-11-27 18:42:18.322279662 +0000
@@ -0,0 +1,137 @@
 +/*
 + * arch/arm/mach-kirkwood/ionics-stratus-setup.c
@ -3726,7 +3727,7 @@ diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwo
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c
 --- a/arch/arm/mach-kirkwood/irq.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/irq.c	2015-04-15 06:07:27.179968066 +0000
+++ b/arch/arm/mach-kirkwood/irq.c	2015-11-27 18:42:18.322279662 +0000
@@ -0,0 +1,82 @@
 +/*
 + * arch/arm/mach-kirkwood/irq.c
@ -3812,7 +3813,7 @@ diff -ruN a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c
 +}
 diff -ruN a/arch/arm/mach-kirkwood/lacie_v2-common.c b/arch/arm/mach-kirkwood/lacie_v2-common.c
 --- a/arch/arm/mach-kirkwood/lacie_v2-common.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/lacie_v2-common.c	2015-04-15 06:07:27.180968134 +0000
+++ b/arch/arm/mach-kirkwood/lacie_v2-common.c	2015-11-27 18:42:18.322279662 +0000
@@ -0,0 +1,114 @@
 +/*
 + * arch/arm/mach-kirkwood/lacie_v2-common.c
@ -3930,7 +3931,7 @@ diff -ruN a/arch/arm/mach-kirkwood/lacie_v2-common.c b/arch/arm/mach-kirkwood/la
 +}
 diff -ruN a/arch/arm/mach-kirkwood/lacie_v2-common.h b/arch/arm/mach-kirkwood/lacie_v2-common.h
 --- a/arch/arm/mach-kirkwood/lacie_v2-common.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/lacie_v2-common.h	2015-04-15 06:07:27.181968202 +0000
+++ b/arch/arm/mach-kirkwood/lacie_v2-common.h	2015-11-27 18:42:18.322279662 +0000
@@ -0,0 +1,16 @@
 +/*
 + * arch/arm/mach-kirkwood/lacie_v2-common.h
@ -3950,7 +3951,7 @@ diff -ruN a/arch/arm/mach-kirkwood/lacie_v2-common.h b/arch/arm/mach-kirkwood/la
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
 --- a/arch/arm/mach-kirkwood/mpp.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/mpp.c	2015-04-15 06:07:27.182968270 +0000
+++ b/arch/arm/mach-kirkwood/mpp.c	2015-11-27 18:42:18.322279662 +0000
@@ -0,0 +1,43 @@
 +/*
 + * arch/arm/mach-kirkwood/mpp.c
@ -3997,7 +3998,7 @@ diff -ruN a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
 +}
 diff -ruN a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
 --- a/arch/arm/mach-kirkwood/mpp.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/mpp.h	2015-04-15 06:07:27.188968678 +0000
+++ b/arch/arm/mach-kirkwood/mpp.h	2015-11-27 18:42:18.327279651 +0000
@@ -0,0 +1,348 @@
 +/*
 + * linux/arch/arm/mach-kirkwood/mpp.h -- Multi Purpose Pins
@ -4349,7 +4350,7 @@ diff -ruN a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
 --- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c	2015-04-15 06:07:27.190968814 +0000
+++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c	2015-11-27 18:42:18.327279651 +0000
@@ -0,0 +1,172 @@
 +/*
 + * arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
@ -4525,7 +4526,7 @@ diff -ruN a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkw
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6210-setup.c
 --- a/arch/arm/mach-kirkwood/nas6210-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/nas6210-setup.c	2015-04-15 06:07:27.192968950 +0000
+++ b/arch/arm/mach-kirkwood/nas6210-setup.c	2015-11-27 18:42:18.327279651 +0000
@@ -0,0 +1,186 @@
 +/*
 + * arch/arm/mach-kirkwood/nas6210-setup.c
@ -4715,7 +4716,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c
 --- a/arch/arm/mach-kirkwood/netspace_v2-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c	2015-04-15 06:07:27.196969222 +0000
+++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c	2015-11-27 18:42:18.332279639 +0000
@@ -0,0 +1,293 @@
 +/*
 + * arch/arm/mach-kirkwood/netspace_v2-setup.c
@ -5012,7 +5013,7 @@ diff -ruN a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
 --- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c	2015-04-15 06:07:27.200969494 +0000
+++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c	2015-11-27 18:42:18.332279639 +0000
@@ -0,0 +1,422 @@
 +/*
 + * arch/arm/mach-kirkwood/netxbig_v2-setup.c
@ -5438,7 +5439,7 @@ diff -ruN a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/n
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa310-setup.c
 --- a/arch/arm/mach-kirkwood/nsa310-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/nsa310-setup.c	2015-04-15 06:07:27.204969766 +0000
+++ b/arch/arm/mach-kirkwood/nsa310-setup.c	2015-11-27 18:42:18.332279639 +0000
@@ -0,0 +1,359 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa310-setup.c
@ -5801,7 +5802,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa31
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa320-setup.c
 --- a/arch/arm/mach-kirkwood/nsa320-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/nsa320-setup.c	2015-04-15 06:07:27.207969970 +0000
+++ b/arch/arm/mach-kirkwood/nsa320-setup.c	2015-11-27 18:42:18.337279627 +0000
@@ -0,0 +1,305 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa320-setup.c
@ -6110,7 +6111,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/nsa325-setup.c b/arch/arm/mach-kirkwood/nsa325-setup.c
 --- a/arch/arm/mach-kirkwood/nsa325-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/nsa325-setup.c	2015-04-15 06:07:27.212970311 +0000
+++ b/arch/arm/mach-kirkwood/nsa325-setup.c	2015-11-27 18:42:18.337279627 +0000
@@ -0,0 +1,359 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa325-setup.c
@ -6473,7 +6474,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa325-setup.c b/arch/arm/mach-kirkwood/nsa32
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
 --- a/arch/arm/mach-kirkwood/openrd-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/openrd-setup.c	2015-04-15 06:07:27.215970515 +0000
+++ b/arch/arm/mach-kirkwood/openrd-setup.c	2015-11-27 18:42:18.337279627 +0000
@@ -0,0 +1,255 @@
 +/*
 + * arch/arm/mach-kirkwood/openrd-setup.c
@ -6732,7 +6733,7 @@ diff -ruN a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openr
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
 --- a/arch/arm/mach-kirkwood/pcie.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/pcie.c	2015-04-15 06:07:27.219970787 +0000
+++ b/arch/arm/mach-kirkwood/pcie.c	2015-11-27 18:42:18.342279616 +0000
@@ -0,0 +1,296 @@
 +/*
 + * arch/arm/mach-kirkwood/pcie.c
@ -7032,7 +7033,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
 +}
 diff -ruN a/arch/arm/mach-kirkwood/pm.c b/arch/arm/mach-kirkwood/pm.c
 --- a/arch/arm/mach-kirkwood/pm.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/pm.c	2015-04-15 06:07:27.220970855 +0000
+++ b/arch/arm/mach-kirkwood/pm.c	2015-11-27 18:42:18.342279616 +0000
@@ -0,0 +1,76 @@
 +/*
 + * Power Management driver for Marvell Kirkwood SoCs
@ -7112,7 +7113,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pm.c b/arch/arm/mach-kirkwood/pm.c
 +}
 diff -ruN a/arch/arm/mach-kirkwood/pm.h b/arch/arm/mach-kirkwood/pm.h
 --- a/arch/arm/mach-kirkwood/pm.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/pm.h	2015-04-15 06:07:27.221970923 +0000
+++ b/arch/arm/mach-kirkwood/pm.h	2015-11-27 18:42:18.342279616 +0000
@@ -0,0 +1,26 @@
 +/*
 + * Power Management driver for Marvell Kirkwood SoCs
@ -7142,7 +7143,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pm.h b/arch/arm/mach-kirkwood/pm.h
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pogo_e02-setup.c
 --- a/arch/arm/mach-kirkwood/pogo_e02-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c	2015-04-15 06:07:27.223971059 +0000
+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c	2015-11-27 18:42:18.342279616 +0000
@@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-kirkwood/pogo_e02-setup.c
@ -7261,7 +7262,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pog
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/pogoplugv4-setup.c
 --- a/arch/arm/mach-kirkwood/pogoplugv4-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c	2015-04-15 06:07:27.226971263 +0000
+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c	2015-11-27 18:42:18.342279616 +0000
@@ -0,0 +1,195 @@
 +/*
 + * arch/arm/mach-kirkwood/pogoplugv4-setup.c
@ -7460,7 +7461,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/p
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
 --- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c	2015-04-15 06:07:27.227971331 +0000
+++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c	2015-11-27 18:42:18.342279616 +0000
@@ -0,0 +1,89 @@
 +/*
 + * arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
@ -7553,7 +7554,7 @@ diff -ruN a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwoo
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
 --- a/arch/arm/mach-kirkwood/rd88f6281-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c	2015-04-15 06:07:27.229971467 +0000
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c	2015-11-27 18:42:18.347279604 +0000
@@ -0,0 +1,128 @@
 +/*
 + * arch/arm/mach-kirkwood/rd88f6281-setup.c
@ -7685,7 +7686,7 @@ diff -ruN a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
 --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2015-04-15 06:07:27.231971603 +0000
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2015-11-27 18:42:18.347279604 +0000
@@ -0,0 +1,170 @@
 +/*
 + * arch/arm/mach-kirkwood/sheevaplug-setup.c
@ -7859,7 +7860,7 @@ diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/t5325-setup.c b/arch/arm/mach-kirkwood/t5325-setup.c
 --- a/arch/arm/mach-kirkwood/t5325-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/t5325-setup.c	2015-04-15 06:07:27.233971739 +0000
+++ b/arch/arm/mach-kirkwood/t5325-setup.c	2015-11-27 18:42:18.347279604 +0000
@@ -0,0 +1,216 @@
 +/*
 + *
@ -8079,7 +8080,7 @@ diff -ruN a/arch/arm/mach-kirkwood/t5325-setup.c b/arch/arm/mach-kirkwood/t5325-
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topkick-setup.c
 --- a/arch/arm/mach-kirkwood/topkick-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/topkick-setup.c	2015-04-15 06:07:27.235971875 +0000
+++ b/arch/arm/mach-kirkwood/topkick-setup.c	2015-11-27 18:42:18.347279604 +0000
@@ -0,0 +1,165 @@
 +/*
 + * arch/arm/mach-kirkwood/topkick-setup.c
@ -8248,7 +8249,7 @@ diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topk
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c
 --- a/arch/arm/mach-kirkwood/ts219-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/ts219-setup.c	2015-04-15 06:07:27.237972011 +0000
+++ b/arch/arm/mach-kirkwood/ts219-setup.c	2015-11-27 18:42:18.347279604 +0000
@@ -0,0 +1,142 @@
 +/*
 + *
@ -8394,7 +8395,7 @@ diff -ruN a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c
 --- a/arch/arm/mach-kirkwood/ts41x-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/ts41x-setup.c	2015-04-15 06:07:27.239972147 +0000
+++ b/arch/arm/mach-kirkwood/ts41x-setup.c	2015-11-27 18:42:18.352279593 +0000
@@ -0,0 +1,186 @@
 +/*
 + *
@ -8584,7 +8585,7 @@ diff -ruN a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/tsx1x-common.c b/arch/arm/mach-kirkwood/tsx1x-common.c
 --- a/arch/arm/mach-kirkwood/tsx1x-common.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/tsx1x-common.c	2015-04-15 06:07:27.241972283 +0000
+++ b/arch/arm/mach-kirkwood/tsx1x-common.c	2015-11-27 18:42:18.352279593 +0000
@@ -0,0 +1,113 @@
 +#include <linux/kernel.h>
 +#include <linux/pci.h>
@ -8701,7 +8702,7 @@ diff -ruN a/arch/arm/mach-kirkwood/tsx1x-common.c b/arch/arm/mach-kirkwood/tsx1x
 +
 diff -ruN a/arch/arm/mach-kirkwood/tsx1x-common.h b/arch/arm/mach-kirkwood/tsx1x-common.h
 --- a/arch/arm/mach-kirkwood/tsx1x-common.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/tsx1x-common.h	2015-04-15 06:07:27.242972351 +0000
+++ b/arch/arm/mach-kirkwood/tsx1x-common.h	2015-11-27 18:42:18.352279593 +0000
@@ -0,0 +1,7 @@
 +#ifndef __ARCH_KIRKWOOD_TSX1X_COMMON_H
 +#define __ARCH_KIRKWOOD_TSX1X_COMMON_H
@ -8711,9 +8712,9 @@ diff -ruN a/arch/arm/mach-kirkwood/tsx1x-common.h b/arch/arm/mach-kirkwood/tsx1x
 +
 +#endif
 diff -ruN a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
--- a/arch/arm/mm/Kconfig	2015-04-12 22:12:50.000000000 +0000
-+++ b/arch/arm/mm/Kconfig	2015-04-15 06:07:27.253973099 +0000
-@@ -855,7 +855,7 @@
+--- a/arch/arm/mm/Kconfig	2015-11-02 00:05:25.000000000 +0000
+++ b/arch/arm/mm/Kconfig	2015-11-27 18:42:18.352279593 +0000
+@@ -890,7 +890,7 @@
 
 config CACHE_FEROCEON_L2
 	bool "Enable the Feroceon L2 cache controller"
@ -8723,9 +8724,9 @@ diff -ruN a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
 	select OUTER_CACHE
 	help
 diff -ruN a/drivers/ata/Kconfig b/drivers/ata/Kconfig
--- a/drivers/ata/Kconfig	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/ata/Kconfig	2015-04-15 06:07:27.264973847 +0000
-@@ -299,7 +299,7 @@
+--- a/drivers/ata/Kconfig	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/ata/Kconfig	2015-11-27 18:42:18.352279593 +0000
+@@ -318,7 +318,7 @@
 
 config SATA_MV
 	tristate "Marvell SATA support"
@ -8735,8 +8736,8 @@ diff -ruN a/drivers/ata/Kconfig b/drivers/ata/Kconfig
 	select GENERIC_PHY
 	help
 diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
--- a/drivers/ata/sata_mv.c	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/ata/sata_mv.c	2015-04-15 06:07:27.290975616 +0000
+--- a/drivers/ata/sata_mv.c	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/ata/sata_mv.c	2015-11-27 18:42:18.357279581 +0000
@@ -72,6 +72,7 @@
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
@ -8745,7 +8746,7 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
 
 #define DRV_NAME	"sata_mv"
 #define DRV_VERSION	"1.28"
-@@ -1170,6 +1171,8 @@
+@@ -1175,6 +1176,8 @@
 {
 	int want_ncq = (protocol == ATA_PROT_NCQ);
 
@ -8755,9 +8756,9 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
 		int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
 		if (want_ncq != using_ncq)
 diff -ruN a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
--- a/drivers/cpufreq/Kconfig.arm	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/cpufreq/Kconfig.arm	2015-04-15 06:07:27.312977112 +0000
-@@ -127,7 +127,7 @@
+--- a/drivers/cpufreq/Kconfig.arm	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/cpufreq/Kconfig.arm	2015-11-27 18:42:18.357279581 +0000
+@@ -76,7 +76,7 @@
 	  If in doubt, say Y.
 
 config ARM_KIRKWOOD_CPUFREQ
@ -8767,9 +8768,9 @@ diff -ruN a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
 	  This adds the CPUFreq driver for Marvell Kirkwood
 	  SoCs.
 diff -ruN a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm
--- a/drivers/cpuidle/Kconfig.arm	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/cpuidle/Kconfig.arm	2015-04-15 06:07:27.320977656 +0000
-@@ -29,7 +29,7 @@
+--- a/drivers/cpuidle/Kconfig.arm	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/cpuidle/Kconfig.arm	2015-11-27 18:42:18.362279570 +0000
+@@ -39,7 +39,7 @@
 
 config ARM_KIRKWOOD_CPUIDLE
 	bool "CPU Idle Driver for Marvell Kirkwood SoCs"
@ -8779,9 +8780,9 @@ diff -ruN a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm
 	  This adds the CPU Idle driver for Marvell Kirkwood SoCs.
 
 diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
--- a/drivers/hwmon/Kconfig	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/hwmon/Kconfig	2015-04-15 06:07:27.324977928 +0000
-@@ -1703,6 +1703,19 @@
+--- a/drivers/hwmon/Kconfig	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/hwmon/Kconfig	2015-11-27 18:42:18.362279570 +0000
+@@ -1736,6 +1736,19 @@
 	  This driver provides support for the Ultra45 workstation environmental
 	  sensors.
 
@ -8802,9 +8803,9 @@ diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
 
 comment "ACPI drivers"
 diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
--- a/drivers/hwmon/Makefile	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/hwmon/Makefile	2015-04-15 06:07:27.326978064 +0000
-@@ -115,6 +115,7 @@
+--- a/drivers/hwmon/Makefile	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/hwmon/Makefile	2015-11-27 18:42:18.362279570 +0000
+@@ -116,6 +116,7 @@
 obj-$(CONFIG_SENSORS_MAX6650)	+= max6650.o
 obj-$(CONFIG_SENSORS_MAX6697)	+= max6697.o
 obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o
@ -8814,7 +8815,7 @@ diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
 obj-$(CONFIG_SENSORS_NCT6683)	+= nct6683.o
 diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
 --- a/drivers/hwmon/nsa3xx-hwmon.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/hwmon/nsa3xx-hwmon.c	2015-04-15 06:07:27.329978268 +0000
+++ b/drivers/hwmon/nsa3xx-hwmon.c	2015-11-27 18:42:18.367279558 +0000
@@ -0,0 +1,251 @@
 +/*
 + * drivers/hwmon/nsa3xx-hwmon.c
@ -9068,18 +9069,18 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:nsa3xx-hwmon");
 diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
--- a/drivers/leds/Kconfig	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/leds/Kconfig	2015-04-15 06:07:27.331978404 +0000
-@@ -431,7 +431,7 @@
+--- a/drivers/leds/Kconfig	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/leds/Kconfig	2015-11-27 18:45:00.646905222 +0000
+@@ -456,7 +456,7 @@
 config LEDS_NS2
 	tristate "LED support for Network Space v2 GPIO LEDs"
 	depends on LEDS_CLASS
-	depends on MACH_KIRKWOOD
-+	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+-	depends on MACH_KIRKWOOD || MACH_ARMADA_370
+	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD || MACH_ARMADA_370
 	default y
 	help
- 	  This option enable support for the dual-GPIO LED found on the
-@@ -441,7 +441,7 @@
+ 	  This option enables support for the dual-GPIO LEDs found on the
+@@ -470,7 +470,7 @@
 config LEDS_NETXBIG
 	tristate "LED support for Big Network series LEDs"
 	depends on LEDS_CLASS
@ -9089,8 +9090,8 @@ diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
 	help
 	  This option enable support for LEDs found on the LaCie 2Big
 diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
--- a/drivers/leds/trigger/Kconfig	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/leds/trigger/Kconfig	2015-04-15 06:07:27.291975684 +0000
+--- a/drivers/leds/trigger/Kconfig	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/leds/trigger/Kconfig	2015-11-27 18:42:18.367279558 +0000
@@ -35,7 +35,6 @@
 
 config LEDS_TRIGGER_IDE_DISK
@ -9100,8 +9101,8 @@ diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
 	help
 	  This allows LEDs to be controlled by IDE disk activity.
 diff -ruN a/drivers/leds/trigger/ledtrig-ide-disk.c b/drivers/leds/trigger/ledtrig-ide-disk.c
--- a/drivers/leds/trigger/ledtrig-ide-disk.c	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/leds/trigger/ledtrig-ide-disk.c	2015-04-15 06:07:27.293975820 +0000
+--- a/drivers/leds/trigger/ledtrig-ide-disk.c	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/leds/trigger/ledtrig-ide-disk.c	2015-11-27 18:42:18.367279558 +0000
@@ -18,25 +18,36 @@
 
 #define BLINK_DELAY 30
@ -9146,9 +9147,9 @@ diff -ruN a/drivers/leds/trigger/ledtrig-ide-disk.c b/drivers/leds/trigger/ledtr
 
 module_init(ledtrig_ide_init);
 diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
--- a/drivers/mmc/core/core.c	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/mmc/core/core.c	2015-04-15 06:07:27.336978745 +0000
-@@ -811,7 +811,7 @@
+--- a/drivers/mmc/core/core.c	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/mmc/core/core.c	2015-11-27 18:42:18.372279547 +0000
+@@ -848,7 +848,7 @@
 			 */
 			limit_us = 3000000;
 		else
@ -9158,8 +9159,8 @@ diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
 		/*
 		 * SDHC cards always use these fixed values.
 diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
--- a/drivers/mmc/core/sd.c	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/mmc/core/sd.c	2015-04-15 06:07:27.339978949 +0000
+--- a/drivers/mmc/core/sd.c	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/mmc/core/sd.c	2015-11-27 18:42:18.372279547 +0000
@@ -366,6 +366,15 @@
 		return -ENOMEM;
 	}
@ -9177,8 +9178,8 @@ diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
 	if (err)
 		goto out;
 diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
--- a/drivers/mmc/host/mvsdio.c	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/mmc/host/mvsdio.c	2015-04-15 08:20:37.331589081 +0000
+--- a/drivers/mmc/host/mvsdio.c	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/mmc/host/mvsdio.c	2015-11-27 18:42:18.372279547 +0000
@@ -25,6 +25,7 @@
 #include <linux/of_irq.h>
 #include <linux/mmc/host.h>
@ -9196,9 +9197,9 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
 	cmdreg = MVSD_CMD_INDEX(cmd->opcode);
 
 diff -ruN a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
--- a/drivers/rtc/Kconfig	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/rtc/Kconfig	2015-04-15 06:07:27.347979493 +0000
-@@ -1333,7 +1333,7 @@
+--- a/drivers/rtc/Kconfig	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/rtc/Kconfig	2015-11-27 18:42:18.397279489 +0000
+@@ -1369,7 +1369,7 @@
 
 config RTC_DRV_MV
 	tristate "Marvell SoC RTC"
@ -9208,21 +9209,21 @@ diff -ruN a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
 	  If you say yes here you will get support for the in-chip RTC
 	  that can be found in some of Marvell's SoC devices, such as
 diff -ruN a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
--- a/drivers/thermal/Kconfig	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/thermal/Kconfig	2015-04-15 06:07:27.349979629 +0000
-@@ -175,7 +175,7 @@
+--- a/drivers/thermal/Kconfig	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/thermal/Kconfig	2015-11-27 18:45:31.591831565 +0000
+@@ -208,7 +208,7 @@
 
 config KIRKWOOD_THERMAL
 	tristate "Temperature sensor on Marvell Kirkwood SoCs"
-	depends on MACH_KIRKWOOD
-+	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+-	depends on MACH_KIRKWOOD || COMPILE_TEST
+	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD || COMPILE_TEST
 	depends on OF
 	help
 	  Support for the Kirkwood thermal sensor driver into the Linux thermal
 diff -ruN a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
--- a/drivers/watchdog/Kconfig	2015-04-12 22:12:50.000000000 +0000
-+++ b/drivers/watchdog/Kconfig	2015-04-15 06:07:27.353979901 +0000
-@@ -329,7 +329,7 @@
+--- a/drivers/watchdog/Kconfig	2015-11-02 00:05:25.000000000 +0000
+++ b/drivers/watchdog/Kconfig	2015-11-27 18:42:18.397279489 +0000
+@@ -359,7 +359,7 @@
 
 config ORION_WATCHDOG
 	tristate "Orion watchdog"
@ -9233,7 +9234,7 @@ diff -ruN a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
 	  Say Y here if to include support for the watchdog timer
 diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h
 --- a/include/linux/bubba3.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/include/linux/bubba3.h	2015-04-15 06:07:27.355980037 +0000
+++ b/include/linux/bubba3.h	2015-11-27 18:42:18.402279478 +0000
@@ -0,0 +1,41 @@
 +/*
 + * (C) Copyright 2010
@ -9277,9 +9278,9 @@ diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h
 +
 +#endif
 diff -ruN a/include/linux/leds.h b/include/linux/leds.h
--- a/include/linux/leds.h	2015-04-12 22:12:50.000000000 +0000
-+++ b/include/linux/leds.h	2015-04-15 06:07:27.295975956 +0000
-@@ -268,9 +268,9 @@
+--- a/include/linux/leds.h	2015-11-02 00:05:25.000000000 +0000
+++ b/include/linux/leds.h	2015-11-27 18:42:18.402279478 +0000
+@@ -296,9 +296,9 @@
 
 /* Trigger specific functions */
 #ifdef CONFIG_LEDS_TRIGGER_IDE_DISK
@ -9293,7 +9294,7 @@ diff -ruN a/include/linux/leds.h b/include/linux/leds.h
 #if defined(CONFIG_LEDS_TRIGGER_CAMERA) || defined(CONFIG_LEDS_TRIGGER_CAMERA_MODULE)
 diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h
 --- a/include/linux/nsa3xx-hwmon.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/include/linux/nsa3xx-hwmon.h	2015-04-15 06:07:27.356980105 +0000
+++ b/include/linux/nsa3xx-hwmon.h	2015-11-27 18:42:18.402279478 +0000
@@ -0,0 +1,21 @@
 +/*
 + * include/linux/nsa3xx.hwmon.h
--- a/core/linux-kirkwood/config
+++ b/core/linux-kirkwood/config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.2.5-1 Kernel Configuration
+# Linux/arm 4.3.0-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -10,6 +10,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_NEED_DMA_MAP_STATE=y
@ -99,7 +100,6 @@ CONFIG_SRCU=y
 # CONFIG_TASKS_RCU is not set
 CONFIG_RCU_STALL_COMMON=y
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_RCU_NOCB_CPU is not set
 # CONFIG_RCU_EXPEDITE_BOOT is not set
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
@ -109,6 +109,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_FREEZER=y
+# CONFIG_CGROUP_PIDS is not set
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
@ -170,7 +171,9 @@ CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
+# CONFIG_USERFAULTFD is not set
 CONFIG_PCI_QUIRKS=y
+CONFIG_MEMBARRIER=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_USE_VMALLOC=y
@ -185,13 +188,15 @@ CONFIG_SLUB_DEBUG=y
 CONFIG_COMPAT_BRK=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
-# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_DATA_VERIFICATION is not set
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+CONFIG_KEXEC_CORE=y
 CONFIG_OPROFILE=m
 CONFIG_HAVE_OPROFILE=y
 CONFIG_KPROBES=y
 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_ARCH_USE_BUILTIN_BSWAP=y
@ -454,6 +459,7 @@ CONFIG_AEABI=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 CONFIG_HAVE_ARCH_PFN_VALID=y
 # CONFIG_HIGHMEM is not set
+CONFIG_CPU_SW_DOMAIN_PAN=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 # CONFIG_ARM_MODULE_PLTS is not set
@ -479,6 +485,8 @@ CONFIG_ZPOOL=m
 CONFIG_ZSMALLOC=y
 # CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_FRAME_VECTOR=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_UACCESS_WITH_MEMCPY=y
@ -626,7 +634,6 @@ CONFIG_SYN_COOKIES=y
 CONFIG_NET_UDP_TUNNEL=m
 CONFIG_NET_FOU=m
 # CONFIG_NET_FOU_IP_TUNNELS is not set
-CONFIG_GENEVE_CORE=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@ -651,6 +658,7 @@ CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
 # CONFIG_IPV6_MIP6 is not set
+CONFIG_IPV6_ILA=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_TRANSPORT=m
@ -853,7 +861,9 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_NF_TABLES_IPV4=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
 CONFIG_NF_TABLES_ARP=m
+CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_REJECT_IPV4=m
@ -895,6 +905,8 @@ CONFIG_NF_CONNTRACK_IPV6=m
 CONFIG_NF_TABLES_IPV6=m
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
 CONFIG_NF_NAT_IPV6=m
@ -1163,6 +1175,7 @@ CONFIG_BT_BNEP=m
 # CONFIG_BT_BNEP_MC_FILTER is not set
 # CONFIG_BT_BNEP_PROTO_FILTER is not set
 CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
 CONFIG_BT_LE=y
 # CONFIG_BT_6LOWPAN is not set
 # CONFIG_BT_SELFTEST is not set
@ -1186,6 +1199,7 @@ CONFIG_BT_HCIUART_LL=y
 # CONFIG_BT_HCIUART_3WIRE is not set
 # CONFIG_BT_HCIUART_INTEL is not set
 # CONFIG_BT_HCIUART_BCM is not set
+# CONFIG_BT_HCIUART_QCA is not set
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@ -1242,6 +1256,7 @@ CONFIG_CAIF_NETDEV=m
 # CONFIG_CAIF_USB is not set
 # CONFIG_CEPH_LIB is not set
 # CONFIG_NFC is not set
+CONFIG_LWTUNNEL=y
 CONFIG_HAVE_BPF_JIT=y

 #
@ -1365,7 +1380,8 @@ CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_ECC_BCH is not set
 # CONFIG_MTD_SM_COMMON is not set
-# CONFIG_MTD_NAND_DENALI 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_IDS=y
@ -1502,6 +1518,7 @@ CONFIG_TI_ST=m
 # CONFIG_ECHO is not set
 # CONFIG_CXL_BASE is not set
 # CONFIG_CXL_KERNEL_API is not set
+# CONFIG_CXL_EEH is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set

@ -1751,6 +1768,7 @@ CONFIG_TUN=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
 # CONFIG_NLMON is not set
+# CONFIG_NET_VRF is not set
 # CONFIG_ARCNET is not set

 #
@ -1851,6 +1869,7 @@ 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_NET_VENDOR_MICREL=y
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851 is not set
@ -1909,6 +1928,7 @@ 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_NET_VENDOR_TEHUTI=y
 # CONFIG_TEHUTI is not set
 CONFIG_NET_VENDOR_TI=y
@ -1931,6 +1951,7 @@ CONFIG_PHYLIB=y
 #
 # MII PHY device drivers
 #
+# CONFIG_AQUANTIA_PHY is not set
 CONFIG_AT803X_PHY=m
 # CONFIG_AMD_PHY is not set
 CONFIG_MARVELL_PHY=y
@ -1939,6 +1960,7 @@ CONFIG_MARVELL_PHY=y
 # CONFIG_LXT_PHY is not set
 # CONFIG_CICADA_PHY is not set
 # CONFIG_VITESSE_PHY is not set
+# CONFIG_TERANETICS_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_BCM7XXX_PHY is not set
@ -1949,7 +1971,9 @@ CONFIG_MARVELL_PHY=y
 # CONFIG_STE10XP is not set
 # CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_MICREL_PHY is not set
+# CONFIG_DP83848_PHY is not set
 # CONFIG_DP83867_PHY is not set
+# CONFIG_MICROCHIP_PHY is not set
 # CONFIG_FIXED_PHY is not set
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BCM_UNIMAC is not set
@ -1973,6 +1997,7 @@ CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_AX88179_178A=m
@ -2007,6 +2032,7 @@ CONFIG_USB_NET_INT51X1=m
 CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
 CONFIG_WLAN=y
 CONFIG_LIBERTAS_THINFIRM=m
 # CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
@ -2278,6 +2304,7 @@ CONFIG_INPUT_TABLET=y
 # CONFIG_TABLET_USB_KBTAB is not set
 CONFIG_TABLET_SERIAL_WACOM4=m
 CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_PROPERTIES=y
 CONFIG_TOUCHSCREEN_ADS7846=m
 CONFIG_TOUCHSCREEN_AD7877=m
 CONFIG_TOUCHSCREEN_AD7879=m
@ -2398,6 +2425,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 # CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
+# CONFIG_SERIAL_UARTLITE is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_JSM is not set
@ -2438,6 +2466,7 @@ CONFIG_I2C_MUX=m
 # CONFIG_I2C_MUX_PCA9541 is not set
 # CONFIG_I2C_MUX_PCA954x is not set
 # CONFIG_I2C_MUX_PINCTRL is not set
+# CONFIG_I2C_MUX_REG is not set
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_ALGOBIT=m

@ -2469,6 +2498,7 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 # CONFIG_I2C_DESIGNWARE_PCI is not set
+# CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_GPIO is not set
 CONFIG_I2C_MV64XXX=y
 # CONFIG_I2C_OCORES is not set
@ -2603,6 +2633,7 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_ZX is not set

 #
 # USB GPIO expanders
@ -2799,10 +2830,6 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
 # CONFIG_THERMAL_EMULATION is not set
-
-#
-# Texas Instruments thermal drivers
-#
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@ -2877,6 +2904,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_DA9052_SPI is not set
 # CONFIG_MFD_DA9052_I2C is not set
 # CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_DLN2 is not set
@ -3175,6 +3203,8 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 #
 # Media capture support
 #
+# CONFIG_VIDEO_SOLO6X10 is not set
+CONFIG_VIDEO_TW68=m

 #
 # Media capture/analog TV support
@ -3183,8 +3213,6 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_VIDEO_HEXIUM_GEMINI is not set
 # CONFIG_VIDEO_HEXIUM_ORION is not set
 # CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_SOLO6X10 is not set
-CONFIG_VIDEO_TW68=m
 # CONFIG_VIDEO_DT3155 is not set

 #
@ -3212,12 +3240,14 @@ CONFIG_VIDEO_TW68=m
 # CONFIG_DVB_NGENE is not set
 # CONFIG_DVB_DDBRIDGE is not set
 # CONFIG_DVB_SMIPCIE is not set
+# CONFIG_DVB_NETUP_UNIDVB is not set
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_SOC_CAMERA=m
 CONFIG_SOC_CAMERA_PLATFORM=m
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_DVB_PLATFORM_DRIVERS is not set

 #
 # Supported MMC/SDIO adapters
@ -3503,10 +3533,6 @@ CONFIG_DVB_AF9033=m
 #
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
-
-#
-# Direct Rendering Manager
-#
 # CONFIG_DRM is not set

 #
@ -3567,6 +3593,7 @@ CONFIG_FB_UDL=m
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
 # CONFIG_FB_AUO_K190X is not set
+# CONFIG_FB_SM712 is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_L4F00242T03 is not set
@ -3584,6 +3611,7 @@ CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_HX8357 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_GENERIC=m
+# CONFIG_BACKLIGHT_PM8941_WLED is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
@ -3675,7 +3703,6 @@ CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
-# CONFIG_SND_SOC_QCOM is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 CONFIG_SND_SOC_I2C_AND_SPI=m

@ -3699,8 +3726,10 @@ CONFIG_SND_SOC_ALC5623=m
 # CONFIG_SND_SOC_CS4271_I2C is not set
 # CONFIG_SND_SOC_CS4271_SPI is not set
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
+# CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_HDMI_CODEC is not set
 # CONFIG_SND_SOC_ES8328 is not set
+# CONFIG_SND_SOC_GTM601 is not set
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM1792A is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
@ -3715,6 +3744,7 @@ CONFIG_SND_SOC_ALC5623=m
 # CONFIG_SND_SOC_SSM4567 is not set
 # CONFIG_SND_SOC_STA32X is not set
 # CONFIG_SND_SOC_STA350 is not set
+# CONFIG_SND_SOC_STI_SAS is not set
 # CONFIG_SND_SOC_TAS2552 is not set
 # CONFIG_SND_SOC_TAS5086 is not set
 # CONFIG_SND_SOC_TAS571X is not set
@ -3777,6 +3807,7 @@ CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 CONFIG_HID_EZKEY=m
+# CONFIG_HID_GEMBIRD is not set
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
 # CONFIG_HID_GT683R is not set
@ -3879,6 +3910,7 @@ CONFIG_USB_WUSB=m
 # CONFIG_USB_C67X00_HCD is not set
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_PCI=y
+# CONFIG_USB_XHCI_PLATFORM is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@ -4124,7 +4156,6 @@ CONFIG_LEDS_NETXBIG=y
 # LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
 #
 # CONFIG_LEDS_BLINKM is not set
-# CONFIG_LEDS_PM8941_WLED is not set

 #
 # LED Triggers
@ -4247,12 +4278,13 @@ CONFIG_DMADEVICES=y
 # DMA Devices
 #
 CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
+CONFIG_DMA_ENGINE=y
+# CONFIG_IDMA64 is not set
+CONFIG_MV_XOR=y
+# CONFIG_NBPFAXI_DMA is not set
 # CONFIG_DW_DMAC is not set
 # CONFIG_DW_DMAC_PCI is not set
 # CONFIG_HSU_DMA_PCI is not set
-CONFIG_MV_XOR=y
-# CONFIG_NBPFAXI_DMA is not set
-CONFIG_DMA_ENGINE=y

 #
 # DMA Clients
@ -4372,7 +4404,6 @@ CONFIG_R8188EU=m
 # Triggers - standalone
 #
 # CONFIG_IIO_SIMPLE_DUMMY is not set
-# CONFIG_FB_SM7XX is not set
 # CONFIG_FB_SM750 is not set
 CONFIG_FB_XGI=m
 # CONFIG_FT1000 is not set
@ -4387,7 +4418,6 @@ CONFIG_FB_XGI=m
 #
 # Android
 #
-CONFIG_USB_WPAN_HCD=m
 # CONFIG_WIMAX_GDM72XX is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_MTD_SPINAND_MT29F is not set
@ -4396,6 +4426,7 @@ CONFIG_USB_WPAN_HCD=m
 # CONFIG_DGAP is not set
 # CONFIG_GS_FPGABOOT is not set
 # CONFIG_FB_TFT is not set
+# CONFIG_MOST is not set
 # CONFIG_CHROME_PLATFORMS is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
@ -4460,8 +4491,8 @@ CONFIG_IIO=m
 # CONFIG_HID_SENSOR_ACCEL_3D is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_KXSD9 is not set
-# CONFIG_MMA8452 is not set
 # CONFIG_KXCJK1013 is not set
+# CONFIG_MMA8452 is not set
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_STK8312 is not set
@ -4582,7 +4613,10 @@ CONFIG_CM32181=m
 # CONFIG_HID_SENSOR_ALS is not set
 # CONFIG_HID_SENSOR_PROX is not set
 # CONFIG_JSA1212 is not set
+# CONFIG_RPR0521 is not set
 # CONFIG_LTR501 is not set
+# CONFIG_OPT3001 is not set
+# CONFIG_PA12203001 is not set
 # CONFIG_STK3310 is not set
 # CONFIG_TCS3414 is not set
 # CONFIG_TCS3472 is not set
@ -4649,12 +4683,19 @@ CONFIG_GENERIC_PHY=y
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_POWERCAP is not set
 # CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
+CONFIG_ARM_PMU=y
+# CONFIG_RAS is not set
 # CONFIG_THUNDERBOLT is not set

 #
 # Android
 #
 # CONFIG_ANDROID is not set
+# CONFIG_NVMEM is not set

 #
 # Firmware Drivers
@ -4667,7 +4708,7 @@ CONFIG_GENERIC_PHY=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_ENCRYPTION=y
@ -5044,7 +5085,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_TORTURE_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=21
-# CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
@ -5109,6 +5149,7 @@ CONFIG_PROBE_EVENTS=y
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_MEMTEST is not set
+# CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
@ -5191,6 +5232,7 @@ CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 CONFIG_CRYPTO_GF128MUL=y
 CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 # CONFIG_CRYPTO_MCRYPTD is not set
@ -5299,6 +5341,11 @@ CONFIG_CRYPTO_DEV_MV_CESA=m
 # CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
+
+#
+# Certificates for signature checking
+#
+# CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM=y
 CONFIG_CRYPTO_SHA256_ARM=y
@ -5318,7 +5365,6 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IO=y
-CONFIG_PERCPU_RWSEM=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
@ -5373,7 +5419,6 @@ CONFIG_NLATTR=y
 CONFIG_GENERIC_ATOMIC64=y
 CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_LRU_CACHE=m
-CONFIG_AVERAGE=y
 CONFIG_CLZ_TAB=y
 # CONFIG_CORDIC is not set
 # CONFIG_DDR is not set
@ -5383,5 +5428,6 @@ CONFIG_FONT_SUPPORT=m
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
+# CONFIG_SG_SPLIT is not set
 # CONFIG_ARCH_HAS_SG_CHAIN is not set
 # CONFIG_VIRTUALIZATION is not set
--- a/core/linux-kirkwood/linux-kirkwood.install
+++ b/core/linux-kirkwood/linux-kirkwood.install
@ -2,13 +2,16 @@
 # arg 2:  the old package version

 KERNEL_NAME=-kirkwood
-KERNEL_VERSION=4.2.2-1-ARCH
+KERNEL_VERSION=4.3.0-1-ARCH

 post_install () {
  # updating module dependencies
  echo ">>> Updating module dependencies. Please wait ..."
  depmod ${KERNEL_VERSION}

+  echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
+  mkinitcpio -p linux${KERNEL_NAME}
+
  echo "**********************************************************************"
  echo "WARNING! This kernel requires a newer U-Boot than many devices such as"
  echo "         the Dockstar and Pogoplug v2 originally came with. If you do"
@ -27,4 +30,12 @@ post_upgrade() {
  # updating module dependencies
  echo ">>> Updating module dependencies. Please wait ..."
  depmod ${KERNEL_VERSION}
+
+  echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
+  mkinitcpio -p linux${KERNEL_NAME}
+}
+
+post_remove() {
+  # also remove the compat symlinks
+  rm -f boot/initramfs-linux.img
 }
--- a/core/linux-kirkwood/linux.preset
+++ b/core/linux-kirkwood/linux.preset
@ -0,0 +1,10 @@
+# mkinitcpio preset file for the 'linux-aarch64' package
+
+ALL_config="/etc/mkinitcpio.conf"
+ALL_kver="4.3.0-1-ARCH"
+
+PRESETS=('default')
+
+#default_config="/etc/mkinitcpio.conf"
+default_image="/boot/initramfs-linux.img"
+#default_options=""
--- a/core/linux-kirkwood/usb-add-reset-resume-quirk-for-several-webcams.patch
+++ b/core/linux-kirkwood/usb-add-reset-resume-quirk-for-several-webcams.patch
@ -1,44 +0,0 @@
-diff -ruN a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
--- a/drivers/usb/core/quirks.c	2013-05-07 21:58:03.000000000 -0600
-+++ b/drivers/usb/core/quirks.c	2013-05-08 23:15:23.000000000 -0600
-@@ -64,6 +64,30 @@
- 	/* Logitech Quickcam OEM Cisco VT Camera II */
- 	{ USB_DEVICE(0x046d, 0x08c7), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	/* Logitech Webcam C200 */
-+	{ USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C250 */
-+	{ USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C300 */
-+	{ USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam B/C500 */
-+	{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C600 */
-+	{ USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam Pro 9000 */
-+	{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C310 */
-+	{ USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME },
-+
-+	/* Logitech Webcam C270 */
-+	{ USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* Logitech Harmony 700-series */
- 	{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
- 
-@@ -108,6 +132,9 @@
- 	/* Midiman M-Audio Keystation 88es */
- 	{ USB_DEVICE(0x0763, 0x0192), .driver_info = USB_QUIRK_RESET_RESUME },
- 
-+	/* Guillemot Webcam Hercules Dualpix Exchange*/
-+	{ USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
-+
- 	/* M-Systems Flash Disk Pioneers */
- 	{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
-