core/linux-kirkwood to 4.0-1

core/linux-kirkwood/PKGBUILD

@@ -6,18 +6,18 @@ buildarch=2
 pkgbase=linux-kirkwood
 _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood"
-pkgver=3.19.3
+pkgver=4.0
 pkgrel=1
 cryptodev_commit=5054d20d45571cc85339351fde52f872eeb82206
 bfqver=v7r7
 
 ### BFQ patch kernel version
-bfqkern=${pkgver:0:4}
-#bfqkern=3.18
+#bfqkern=${pkgver:0:4}
+bfqkern=3.19
 
 ### AUFS branch name
-aufsbranch="aufs${pkgver:0:4}"
-#aufsbranch="aufs3.x-rcN"
+#aufsbranch="aufs${pkgver:0:4}"
+aufsbranch="aufs3.x-rcN"
 
 arch=('arm')
 url="http://www.kernel.org/"
@@ -25,7 +25,7 @@ license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'kmod' 'inetutils' 'bc' 'git')
 options=('!strip')
 
-source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz"
+source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${pkgver}.tar.xz"
         'archlinuxarm.patch'
         'config'
         'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
@@ -37,8 +37,8 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz"
         "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")
 
-md5sums=('f543c62a717a514d99724e9bda15471e'
-         '3fcdf9f1ddbfda0b843f15164f612e59'
+md5sums=('a86916bd12798220da9eb4a1eec3616d'
+         '4c93651af09f6ded12855eec3704cba1'
          'b295fdc2d4be88e7516b60e58a6b5b25'
          'df25fccf87d246f97dac2843e22debe6'
          '9b5a265440abf57d2052838f31486a3a'

core/linux-kirkwood/archlinuxarm.patch

@@ -1,7 +1,7 @@
 diff -ruN a/arch/arm/Kconfig b/arch/arm/Kconfig
---- a/arch/arm/Kconfig	2014-12-07 22:21:05.000000000 +0000
-+++ b/arch/arm/Kconfig	2014-12-12 01:25:01.856852253 +0000
-@@ -536,6 +536,21 @@
+--- 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 @@
  	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
-@@ -892,6 +907,8 @@
+@@ -887,6 +902,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	2014-12-07 22:21:05.000000000 +0000
-+++ b/arch/arm/Kconfig.debug	2014-12-12 01:25:01.866852959 +0000
-@@ -1088,7 +1088,7 @@
+--- 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 @@
  	def_bool ARCH_DOVE || ARCH_EBSA110 || \
  		(FOOTBRIDGE && !DEBUG_DC21285_PORT) || \
  		ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \
@@ -44,16 +44,16 @@ diff -ruN a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
  		ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC
  
  # Compatibility options for BCM63xx
-@@ -1154,7 +1154,7 @@
- 	default 0xe4007000 if DEBUG_HIP04_UART
- 	default 0xf0000be0 if ARCH_EBSA110
- 	default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE
+@@ -1411,7 +1411,7 @@
+ 	default 0xf040ab00 if DEBUG_BRCMSTB_UART
+ 	default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE
+ 	default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE
 -	default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || \
 +	default 0xf1012000 if ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
  				ARCH_ORION5X
  	default 0xf7fc9000 if DEBUG_BERLIN_UART
  	default 0xf8b00000 if DEBUG_HIX5HD2_UART
-@@ -1228,6 +1228,7 @@
+@@ -1507,6 +1507,7 @@
  	default 0xfec90000 if DEBUG_RK32_UART2
  	default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
  	default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
@@ -62,9 +62,9 @@ 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	2014-12-07 22:21:05.000000000 +0000
-+++ b/arch/arm/Makefile	2014-12-12 01:25:01.871853311 +0000
-@@ -165,6 +165,7 @@
+--- 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 @@
  machine-$(CONFIG_ARCH_IOP33X)		+= iop33x
  machine-$(CONFIG_ARCH_IXP4XX)		+= ixp4xx
  machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone
@@ -74,7 +74,7 @@ diff -ruN a/arch/arm/Makefile b/arch/arm/Makefile
  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	2014-12-12 01:25:01.878853805 +0000
++++ b/arch/arm/mach-kirkwood/Kconfig	2015-04-15 06:07:27.136965141 +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	2014-12-12 01:25:01.881854016 +0000
++++ b/arch/arm/mach-kirkwood/Makefile	2015-04-15 06:07:27.137965209 +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	2014-12-12 01:25:01.882854087 +0000
++++ b/arch/arm/mach-kirkwood/Makefile.boot	2015-04-15 06:07:27.138965277 +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	2014-12-12 01:25:01.888854510 +0000
++++ b/arch/arm/mach-kirkwood/board-dt.c	2015-04-15 06:07:27.141965481 +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	2014-12-12 01:25:01.891854722 +0000
++++ b/arch/arm/mach-kirkwood/bubba3-gpio.c	2015-04-15 06:07:27.144965685 +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	2014-12-12 01:25:01.894854933 +0000
++++ b/arch/arm/mach-kirkwood/bubba3-setup.c	2015-04-15 06:07:27.146965822 +0000
 @@ -0,0 +1,234 @@
 +/*
 + * arch/arm/mach-kirkwood/bubba3-setup.c
@@ -1243,7 +1243,7 @@ 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	2014-12-12 01:25:01.902855497 +0000
++++ b/arch/arm/mach-kirkwood/common.c	2015-04-15 06:07:27.153966298 +0000
 @@ -0,0 +1,746 @@
 +/*
 + * arch/arm/mach-kirkwood/common.c
@@ -1993,7 +1993,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	2014-12-12 01:25:01.903855568 +0000
++++ b/arch/arm/mach-kirkwood/common.h	2015-04-15 06:07:27.154966366 +0000
 @@ -0,0 +1,74 @@
 +/*
 + * arch/arm/mach-kirkwood/common.h
@@ -2071,7 +2071,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	2014-12-12 01:25:01.906855779 +0000
++++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c	2015-04-15 06:07:27.157966570 +0000
 @@ -0,0 +1,231 @@
 +/*
 + * arch/arm/mach-kirkwood/d2net_v2-setup.c
@@ -2306,7 +2306,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	2014-12-12 01:25:01.908855920 +0000
++++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2015-04-15 06:07:27.158966638 +0000
 @@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-kirkwood/dockstar-setup.c
@@ -2425,7 +2425,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	2014-12-12 01:25:01.909855991 +0000
++++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2015-04-15 06:07:27.160966774 +0000
 @@ -0,0 +1,124 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexhome-setup.c
@@ -2553,7 +2553,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	2014-12-12 01:25:01.911856132 +0000
++++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2015-04-15 06:07:27.162966910 +0000
 @@ -0,0 +1,177 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexnet-setup.c
@@ -2734,7 +2734,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	2014-12-12 01:25:01.913856273 +0000
++++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2015-04-15 06:07:27.164967046 +0000
 @@ -0,0 +1,228 @@
 +/*
 + * arch/arm/mach-kirkwood/guruplug-setup.c
@@ -2966,7 +2966,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	2014-12-12 01:25:01.915856414 +0000
++++ b/arch/arm/mach-kirkwood/iconnect-setup.c	2015-04-15 06:07:27.167967250 +0000
 @@ -0,0 +1,204 @@
 +/*
 + * arch/arm/mach-kirkwood/iconnect-setup.c
@@ -3174,7 +3174,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	2014-12-12 01:25:01.916856484 +0000
++++ b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h	2015-04-15 06:07:27.168967318 +0000
 @@ -0,0 +1,86 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/bridge-regs.h
@@ -3264,7 +3264,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	2014-12-12 01:25:01.917856555 +0000
++++ b/arch/arm/mach-kirkwood/include/mach/entry-macro.S	2015-04-15 06:07:27.170967454 +0000
 @@ -0,0 +1,34 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/entry-macro.S
@@ -3302,7 +3302,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	2014-12-12 01:25:01.918856625 +0000
++++ b/arch/arm/mach-kirkwood/include/mach/hardware.h	2015-04-15 06:07:27.171967522 +0000
 @@ -0,0 +1,14 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/hardware.h
@@ -3320,7 +3320,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	2014-12-12 01:25:01.919856696 +0000
++++ b/arch/arm/mach-kirkwood/include/mach/irqs.h	2015-04-15 06:07:27.172967590 +0000
 @@ -0,0 +1,65 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/irqs.h
@@ -3389,7 +3389,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	2014-12-12 01:25:01.921856837 +0000
++++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h	2015-04-15 06:07:27.174967726 +0000
 @@ -0,0 +1,142 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/kirkwood.h
@@ -3535,7 +3535,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	2014-12-12 01:25:01.921856837 +0000
++++ b/arch/arm/mach-kirkwood/include/mach/uncompress.h	2015-04-15 06:07:27.175967794 +0000
 @@ -0,0 +1,46 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/uncompress.h
@@ -3585,7 +3585,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	2014-12-12 01:25:01.923856978 +0000
++++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c	2015-04-15 06:07:27.177967930 +0000
 @@ -0,0 +1,137 @@
 +/*
 + * arch/arm/mach-kirkwood/ionics-stratus-setup.c
@@ -3726,7 +3726,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	2014-12-12 01:25:01.924857049 +0000
++++ b/arch/arm/mach-kirkwood/irq.c	2015-04-15 06:07:27.179968066 +0000
 @@ -0,0 +1,82 @@
 +/*
 + * arch/arm/mach-kirkwood/irq.c
@@ -3812,7 +3812,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	2014-12-12 01:25:01.925857119 +0000
++++ b/arch/arm/mach-kirkwood/lacie_v2-common.c	2015-04-15 06:07:27.180968134 +0000
 @@ -0,0 +1,114 @@
 +/*
 + * arch/arm/mach-kirkwood/lacie_v2-common.c
@@ -3930,7 +3930,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	2014-12-12 01:25:01.926857190 +0000
++++ b/arch/arm/mach-kirkwood/lacie_v2-common.h	2015-04-15 06:07:27.181968202 +0000
 @@ -0,0 +1,16 @@
 +/*
 + * arch/arm/mach-kirkwood/lacie_v2-common.h
@@ -3950,7 +3950,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	2014-12-12 01:25:01.927857260 +0000
++++ b/arch/arm/mach-kirkwood/mpp.c	2015-04-15 06:07:27.182968270 +0000
 @@ -0,0 +1,43 @@
 +/*
 + * arch/arm/mach-kirkwood/mpp.c
@@ -3997,7 +3997,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	2014-12-12 01:25:01.932857613 +0000
++++ b/arch/arm/mach-kirkwood/mpp.h	2015-04-15 06:07:27.188968678 +0000
 @@ -0,0 +1,348 @@
 +/*
 + * linux/arch/arm/mach-kirkwood/mpp.h -- Multi Purpose Pins
@@ -4349,7 +4349,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	2014-12-12 01:25:01.934857754 +0000
++++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c	2015-04-15 06:07:27.190968814 +0000
 @@ -0,0 +1,172 @@
 +/*
 + * arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
@@ -4525,7 +4525,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	2014-12-12 01:25:01.935857824 +0000
++++ b/arch/arm/mach-kirkwood/nas6210-setup.c	2015-04-15 06:07:27.192968950 +0000
 @@ -0,0 +1,186 @@
 +/*
 + * arch/arm/mach-kirkwood/nas6210-setup.c
@@ -4715,7 +4715,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	2014-12-12 01:25:01.938858036 +0000
++++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c	2015-04-15 06:07:27.196969222 +0000
 @@ -0,0 +1,293 @@
 +/*
 + * arch/arm/mach-kirkwood/netspace_v2-setup.c
@@ -5012,7 +5012,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	2014-12-12 01:25:01.942858318 +0000
++++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c	2015-04-15 06:07:27.200969494 +0000
 @@ -0,0 +1,422 @@
 +/*
 + * arch/arm/mach-kirkwood/netxbig_v2-setup.c
@@ -5438,7 +5438,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	2014-12-12 01:25:01.945858529 +0000
++++ b/arch/arm/mach-kirkwood/nsa310-setup.c	2015-04-15 06:07:27.204969766 +0000
 @@ -0,0 +1,359 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa310-setup.c
@@ -5801,7 +5801,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	2014-12-12 01:25:01.947858670 +0000
++++ b/arch/arm/mach-kirkwood/nsa320-setup.c	2015-04-15 06:07:27.207969970 +0000
 @@ -0,0 +1,305 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa320-setup.c
@@ -6110,7 +6110,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	2014-12-12 01:25:01.951858953 +0000
++++ b/arch/arm/mach-kirkwood/nsa325-setup.c	2015-04-15 06:07:27.212970311 +0000
 @@ -0,0 +1,359 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa325-setup.c
@@ -6473,7 +6473,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	2014-12-12 01:25:01.953859094 +0000
++++ b/arch/arm/mach-kirkwood/openrd-setup.c	2015-04-15 06:07:27.215970515 +0000
 @@ -0,0 +1,255 @@
 +/*
 + * arch/arm/mach-kirkwood/openrd-setup.c
@@ -6732,7 +6732,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	2014-12-12 01:25:01.956859305 +0000
++++ b/arch/arm/mach-kirkwood/pcie.c	2015-04-15 06:07:27.219970787 +0000
 @@ -0,0 +1,296 @@
 +/*
 + * arch/arm/mach-kirkwood/pcie.c
@@ -7032,7 +7032,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	2014-12-12 01:25:01.957859376 +0000
++++ b/arch/arm/mach-kirkwood/pm.c	2015-04-15 06:07:27.220970855 +0000
 @@ -0,0 +1,76 @@
 +/*
 + * Power Management driver for Marvell Kirkwood SoCs
@@ -7112,7 +7112,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	2014-12-12 01:25:01.957859376 +0000
++++ b/arch/arm/mach-kirkwood/pm.h	2015-04-15 06:07:27.221970923 +0000
 @@ -0,0 +1,26 @@
 +/*
 + * Power Management driver for Marvell Kirkwood SoCs
@@ -7142,7 +7142,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	2014-12-12 01:25:01.959859517 +0000
++++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c	2015-04-15 06:07:27.223971059 +0000
 @@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-kirkwood/pogo_e02-setup.c
@@ -7261,7 +7261,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	2014-12-12 01:25:01.960859587 +0000
++++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c	2015-04-15 06:07:27.226971263 +0000
 @@ -0,0 +1,195 @@
 +/*
 + * arch/arm/mach-kirkwood/pogoplugv4-setup.c
@@ -7460,7 +7460,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	2014-12-12 01:25:01.962859728 +0000
++++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c	2015-04-15 06:07:27.227971331 +0000
 @@ -0,0 +1,89 @@
 +/*
 + * arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
@@ -7553,7 +7553,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	2014-12-12 01:25:01.963859799 +0000
++++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c	2015-04-15 06:07:27.229971467 +0000
 @@ -0,0 +1,128 @@
 +/*
 + * arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -7685,7 +7685,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	2014-12-12 01:25:01.965859940 +0000
++++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2015-04-15 06:07:27.231971603 +0000
 @@ -0,0 +1,170 @@
 +/*
 + * arch/arm/mach-kirkwood/sheevaplug-setup.c
@@ -7859,7 +7859,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	2014-12-12 01:25:01.967860081 +0000
++++ b/arch/arm/mach-kirkwood/t5325-setup.c	2015-04-15 06:07:27.233971739 +0000
 @@ -0,0 +1,216 @@
 +/*
 + *
@@ -8079,7 +8079,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	2014-12-12 01:25:01.968860151 +0000
++++ b/arch/arm/mach-kirkwood/topkick-setup.c	2015-04-15 06:07:27.235971875 +0000
 @@ -0,0 +1,165 @@
 +/*
 + * arch/arm/mach-kirkwood/topkick-setup.c
@@ -8248,7 +8248,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	2014-12-12 01:25:01.970860292 +0000
++++ b/arch/arm/mach-kirkwood/ts219-setup.c	2015-04-15 06:07:27.237972011 +0000
 @@ -0,0 +1,142 @@
 +/*
 + *
@@ -8394,7 +8394,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	2014-12-12 01:25:01.972860433 +0000
++++ b/arch/arm/mach-kirkwood/ts41x-setup.c	2015-04-15 06:07:27.239972147 +0000
 @@ -0,0 +1,186 @@
 +/*
 + *
@@ -8584,7 +8584,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	2014-12-12 01:25:01.973860504 +0000
++++ b/arch/arm/mach-kirkwood/tsx1x-common.c	2015-04-15 06:07:27.241972283 +0000
 @@ -0,0 +1,113 @@
 +#include <linux/kernel.h>
 +#include <linux/pci.h>
@@ -8701,7 +8701,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	2014-12-12 01:25:01.973860504 +0000
++++ b/arch/arm/mach-kirkwood/tsx1x-common.h	2015-04-15 06:07:27.242972351 +0000
 @@ -0,0 +1,7 @@
 +#ifndef __ARCH_KIRKWOOD_TSX1X_COMMON_H
 +#define __ARCH_KIRKWOOD_TSX1X_COMMON_H
@@ -8711,8 +8711,8 @@ 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	2014-12-07 22:21:05.000000000 +0000
-+++ b/arch/arm/mm/Kconfig	2014-12-12 01:25:01.997862196 +0000
+--- 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 @@
  
  config CACHE_FEROCEON_L2
@@ -8723,8 +8723,8 @@ 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	2014-12-07 22:21:05.000000000 +0000
-+++ b/drivers/ata/Kconfig	2014-12-12 01:29:52.153324472 +0000
+--- 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 @@
  
  config SATA_MV
@@ -8734,11 +8734,10 @@ diff -ruN a/drivers/ata/Kconfig b/drivers/ata/Kconfig
  		   ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST
  	select GENERIC_PHY
  	help
-
 diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
---- a/drivers/ata/sata_mv.c	2013-11-03 16:41:51.000000000 -0700
-+++ b/drivers/ata/sata_mv.c	2013-11-08 01:39:48.868014917 -0700
-@@ -71,6 +71,7 @@
+--- 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
+@@ -72,6 +72,7 @@
  #include <scsi/scsi_cmnd.h>
  #include <scsi/scsi_device.h>
  #include <linux/libata.h>
@@ -8746,7 +8745,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"
-@@ -1161,6 +1162,8 @@
+@@ -1170,6 +1171,8 @@
  {
  	int want_ncq = (protocol == ATA_PROT_NCQ);
  
@@ -8755,82 +8754,10 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
  	if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) {
  		int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
  		if (want_ncq != using_ncq)
-diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
---- a/drivers/leds/trigger/Kconfig	2013-11-03 16:41:51.000000000 -0700
-+++ b/drivers/leds/trigger/Kconfig	2013-11-08 01:39:48.958018410 -0700
-@@ -35,7 +35,6 @@
- 
- config LEDS_TRIGGER_IDE_DISK
- 	bool "LED IDE Disk Trigger"
--	depends on IDE_GD_ATA
- 	depends on LEDS_TRIGGERS
- 	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.
---- a/drivers/leds/trigger/ledtrig-ide-disk.c	2014-10-05 12:23:04.000000000 -0700
-+++ b/drivers/leds/trigger/ledtrig-ide-disk.c	2014-10-09 22:04:58.000000000 -0700
-@@ -18,25 +20,36 @@
- 
- #define BLINK_DELAY 30
- 
--DEFINE_LED_TRIGGER(ledtrig_ide);
-+DEFINE_LED_TRIGGER(ledtrig_ide1);
-+DEFINE_LED_TRIGGER(ledtrig_ide2);
- static unsigned long ide_blink_delay = BLINK_DELAY;
- 
--void ledtrig_ide_activity(void)
-+void ledtrig_ide_activity(int port_number)
- {
--	led_trigger_blink_oneshot(ledtrig_ide,
--				  &ide_blink_delay, &ide_blink_delay, 0);
-+	switch (port_number) {
-+		case 0:
-+		        led_trigger_blink_oneshot(ledtrig_ide1, &ide_blink_delay, &ide_blink_delay, 0);
-+			break;
-+        	case 1:
-+			led_trigger_blink_oneshot(ledtrig_ide2, &ide_blink_delay, &ide_blink_delay, 0);
-+			break;
-+		default:
-+			break;
-+	}
- }
- EXPORT_SYMBOL(ledtrig_ide_activity);
- 
- static int __init ledtrig_ide_init(void)
- {
--	led_trigger_register_simple("ide-disk", &ledtrig_ide);
-+	led_trigger_register_simple("ide-disk1", &ledtrig_ide1); 
-+	led_trigger_register_simple("ide-disk2", &ledtrig_ide2);
- 	return 0;
- }
- 
- static void __exit ledtrig_ide_exit(void)
- {
--	led_trigger_unregister_simple(ledtrig_ide);
-+	led_trigger_unregister_simple(ledtrig_ide1);
-+	led_trigger_unregister_simple(ledtrig_ide2);
- }
- 
- module_init(ledtrig_ide_init);
-diff -ruN a/include/linux/leds.h b/include/linux/leds.h
---- a/include/linux/leds.h	2014-10-05 12:23:04.000000000 -0700
-+++ b/include/linux/leds.h	2014-10-09 22:04:58.000000000 -0700
-@@ -215,9 +216,9 @@
- 
- /* Trigger specific functions */
- #ifdef CONFIG_LEDS_TRIGGER_IDE_DISK
--extern void ledtrig_ide_activity(void);
-+extern void ledtrig_ide_activity(int port_number);
- #else
--static inline void ledtrig_ide_activity(void) {}
-+static inline void ledtrig_ide_activity(int port_number) {}
- #endif
- 
- #if defined(CONFIG_LEDS_TRIGGER_CAMERA) || defined(CONFIG_LEDS_TRIGGER_CAMERA_MODULE)
 diff -ruN a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
---- a/drivers/cpufreq/Kconfig.arm	2014-12-07 22:21:05.000000000 +0000
-+++ b/drivers/cpufreq/Kconfig.arm	2014-12-12 01:26:17.539188086 +0000
-@@ -119,7 +119,7 @@
+--- 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 @@
  	  If in doubt, say Y.
  
  config ARM_KIRKWOOD_CPUFREQ
@@ -8840,8 +8767,8 @@ 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	2014-12-07 22:21:05.000000000 +0000
-+++ b/drivers/cpuidle/Kconfig.arm	2014-12-12 01:30:21.105354272 +0000
+--- 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 @@
  
  config ARM_KIRKWOOD_CPUIDLE
@@ -8852,9 +8779,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	2014-12-07 22:21:05.000000000 +0000
-+++ b/drivers/hwmon/Kconfig	2014-12-12 01:25:02.017863607 +0000
-@@ -1680,6 +1680,19 @@
+--- 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 @@
  	  This driver provides support for the Ultra45 workstation environmental
  	  sensors.
  
@@ -8875,9 +8802,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	2014-12-07 22:21:05.000000000 +0000
-+++ b/drivers/hwmon/Makefile	2014-12-12 01:25:02.019863748 +0000
-@@ -114,6 +114,7 @@
+--- 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 @@
  obj-$(CONFIG_SENSORS_MAX6650)	+= max6650.o
  obj-$(CONFIG_SENSORS_MAX6697)	+= max6697.o
  obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o
@@ -8887,7 +8814,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	2014-12-12 01:25:02.021863889 +0000
++++ b/drivers/hwmon/nsa3xx-hwmon.c	2015-04-15 06:07:27.329978268 +0000
 @@ -0,0 +1,251 @@
 +/*
 + * drivers/hwmon/nsa3xx-hwmon.c
@@ -9141,9 +9068,9 @@ 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	2014-12-07 22:21:05.000000000 +0000
-+++ b/drivers/leds/Kconfig	2014-12-12 01:28:09.555087399 +0000
-@@ -410,7 +410,7 @@
+--- 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 @@
  config LEDS_NS2
  	tristate "LED support for Network Space v2 GPIO LEDs"
  	depends on LEDS_CLASS
@@ -9152,7 +9079,7 @@ diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
  	default y
  	help
  	  This option enable support for the dual-GPIO LED found on the
-@@ -420,7 +420,7 @@
+@@ -441,7 +441,7 @@
  config LEDS_NETXBIG
  	tristate "LED support for Big Network series LEDs"
  	depends on LEDS_CLASS
@@ -9161,10 +9088,67 @@ diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
  	default y
  	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
+@@ -35,7 +35,6 @@
+ 
+ config LEDS_TRIGGER_IDE_DISK
+ 	bool "LED IDE Disk Trigger"
+-	depends on IDE_GD_ATA
+ 	depends on LEDS_TRIGGERS
+ 	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
+@@ -18,25 +18,36 @@
+ 
+ #define BLINK_DELAY 30
+ 
+-DEFINE_LED_TRIGGER(ledtrig_ide);
++DEFINE_LED_TRIGGER(ledtrig_ide1);
++DEFINE_LED_TRIGGER(ledtrig_ide2);
+ static unsigned long ide_blink_delay = BLINK_DELAY;
+ 
+-void ledtrig_ide_activity(void)
++void ledtrig_ide_activity(int port_number)
+ {
+-	led_trigger_blink_oneshot(ledtrig_ide,
+-				  &ide_blink_delay, &ide_blink_delay, 0);
++	switch (port_number) {
++		case 0:
++		        led_trigger_blink_oneshot(ledtrig_ide1, &ide_blink_delay, &ide_blink_delay, 0);
++			break;
++        	case 1:
++			led_trigger_blink_oneshot(ledtrig_ide2, &ide_blink_delay, &ide_blink_delay, 0);
++			break;
++		default:
++			break;
++	}
+ }
+ EXPORT_SYMBOL(ledtrig_ide_activity);
+ 
+ static int __init ledtrig_ide_init(void)
+ {
+-	led_trigger_register_simple("ide-disk", &ledtrig_ide);
++	led_trigger_register_simple("ide-disk1", &ledtrig_ide1); 
++	led_trigger_register_simple("ide-disk2", &ledtrig_ide2);
+ 	return 0;
+ }
+ 
+ static void __exit ledtrig_ide_exit(void)
+ {
+-	led_trigger_unregister_simple(ledtrig_ide);
++	led_trigger_unregister_simple(ledtrig_ide1);
++	led_trigger_unregister_simple(ledtrig_ide2);
+ }
+ 
+ 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	2014-12-07 22:21:05.000000000 +0000
-+++ b/drivers/mmc/core/core.c	2014-12-12 01:25:02.026864241 +0000
-@@ -791,7 +791,7 @@
+--- 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 @@
  			 */
  			limit_us = 3000000;
  		else
@@ -9174,8 +9158,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	2014-12-07 22:21:05.000000000 +0000
-+++ b/drivers/mmc/core/sd.c	2014-12-12 01:25:02.028864382 +0000
+--- 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
 @@ -366,6 +366,15 @@
  		return -ENOMEM;
  	}
@@ -9193,17 +9177,17 @@ 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	2014-12-07 22:21:05.000000000 +0000
-+++ b/drivers/mmc/host/mvsdio.c	2014-12-12 01:25:02.030864523 +0000
+--- 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
 @@ -25,6 +25,7 @@
  #include <linux/of_irq.h>
  #include <linux/mmc/host.h>
  #include <linux/mmc/slot-gpio.h>
 +#include <linux/mmc/sd.h>
- #include <linux/pinctrl/consumer.h>
  
  #include <asm/sizes.h>
-@@ -148,6 +149,7 @@
+ #include <asm/unaligned.h>
+@@ -152,6 +153,7 @@
  
  	dev_dbg(host->dev, "cmd %d (hw state 0x%04x)\n",
  		cmd->opcode, mvsd_read(MVSD_HW_STATE));
@@ -9212,9 +9196,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	2014-12-07 22:21:05.000000000 +0000
-+++ b/drivers/rtc/Kconfig	2014-12-12 01:27:40.764054174 +0000
-@@ -1235,7 +1235,7 @@
+--- 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 @@
  
  config RTC_DRV_MV
  	tristate "Marvell SoC RTC"
@@ -9224,9 +9208,9 @@ 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	2014-12-07 22:21:05.000000000 +0000
-+++ b/drivers/thermal/Kconfig	2014-12-12 01:29:06.189080397 +0000
-@@ -153,7 +153,7 @@
+--- 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 @@
  
  config KIRKWOOD_THERMAL
  	tristate "Temperature sensor on Marvell Kirkwood SoCs"
@@ -9236,8 +9220,8 @@ diff -ruN a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
  	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	2014-12-07 22:21:05.000000000 +0000
-+++ b/drivers/watchdog/Kconfig	2014-12-12 01:27:08.170761622 +0000
+--- 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 @@
  
  config ORION_WATCHDOG
@@ -9249,7 +9233,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	2014-12-12 01:25:02.031864594 +0000
++++ b/include/linux/bubba3.h	2015-04-15 06:07:27.355980037 +0000
 @@ -0,0 +1,41 @@
 +/*
 + * (C) Copyright 2010
@@ -9292,9 +9276,24 @@ diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h
 +#define B3_BUZ_4KHZ		(46)
 +
 +#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 @@
+ 
+ /* Trigger specific functions */
+ #ifdef CONFIG_LEDS_TRIGGER_IDE_DISK
+-extern void ledtrig_ide_activity(void);
++extern void ledtrig_ide_activity(int port_number);
+ #else
+-static inline void ledtrig_ide_activity(void) {}
++static inline void ledtrig_ide_activity(int port_number) {}
+ #endif
+ 
+ #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	2014-12-12 01:25:02.032864664 +0000
++++ b/include/linux/nsa3xx-hwmon.h	2015-04-15 06:07:27.356980105 +0000
 @@ -0,0 +1,21 @@
 +/*
 + * include/linux/nsa3xx.hwmon.h

core/linux-kirkwood/linux-kirkwood.install

@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-kirkwood
-KERNEL_VERSION=3.19.0-0-ARCH
+KERNEL_VERSION=4.0.0-1-ARCH
 
 post_install () {
   # updating module dependencies