core/linux-armv7 to 3.18.0-1

core/linux-armv7/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch

@@ -1,7 +1,7 @@
-From 285f6acfbbada8767df3afef1e9ca0c520b521e3 Mon Sep 17 00:00:00 2001
+From 890518b12674120f5978fc4d147f89377c778643 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
-Subject: [PATCH 1/4] ARM: atags: add support for Marvell's u-boot
+Subject: [PATCH 1/5] ARM: atags: add support for Marvell's u-boot
 
 Marvell uses a specific atag in its u-boot which includes among other
 information the MAC addresses for up to 4 network interfaces.
@@ -47,5 +47,5 @@ index 979ff40..d1d0c19 100644
  };
  
 -- 
-1.9.0
+2.1.3
 

core/linux-armv7/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch

@@ -1,7 +1,7 @@
-From 97ab956f6b7398968dc3c2531cca009dc8506d9e Mon Sep 17 00:00:00 2001
+From f6724eeed1f0d666a42dc5eab84801159180ed95 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
-Subject: [PATCH 2/4] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
+Subject: [PATCH 2/5] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
  loader
 
 The atags are parsed and if a Marvell atag is found, up to 4 MAC
@@ -43,5 +43,5 @@ index 9448aa0..ac7b6ae 100644
  	}
  
 -- 
-1.9.0
+2.1.3
 

core/linux-armv7/0003-SMILE-Plug-device-tree-file.patch

@@ -1,7 +1,7 @@
-From 8e2d11f6ae3ca2fe7bd656f28a29404012e57e1d Mon Sep 17 00:00:00 2001
+From 0bd610833e1b9ace289a46ff70b46ac9fa7003a8 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:41:19 -0600
-Subject: [PATCH 3/4] SMILE Plug device tree file
+Subject: [PATCH 3/5] SMILE Plug device tree file
 
 This adds a dts file for the SMILE Plug, which only differs from the Mirabox
 dts with the LED definitions.
@@ -14,10 +14,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index b8c5cd3..da19c45 100644
+index 38c89ca..80651e3 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -469,6 +469,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
+@@ -493,6 +493,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
  dtb-$(CONFIG_MACH_ARMADA_370) += \
  	armada-370-db.dtb \
  	armada-370-mirabox.dtb \
@@ -199,5 +199,5 @@ index 0000000..6b30e82
 +	};
 +};
 -- 
-1.9.0
+2.1.3
 

core/linux-armv7/0004-fix-mvsdio-eMMC-timing.patch

@@ -1,7 +1,7 @@
-From 824d945bc3c3ec1a635ea078f6b4b19f0c780782 Mon Sep 17 00:00:00 2001
+From 8363a1be0d3c12ed4d07fff0036700cd0419162e Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:43:56 -0600
-Subject: [PATCH 4/4] fix mvsdio eMMC timing
+Subject: [PATCH 4/5] fix mvsdio eMMC timing
 
 These changes from Globalscale change the MMC timing to allow the eMMC versions
 of the Mirabox and SMILE Plug to work.
@@ -34,5 +34,5 @@ index 6b4c5ad..9f50234 100644
  		host->clock = ios->clock;
  		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
 -- 
-1.9.0
+2.1.3
 

core/linux-armv7/0005-mmc-mvsdio-Work-around-broken-TX-DMA.patch

@@ -1,7 +1,7 @@
-From 3c583f70a8e2feda03db77d2c8e9a41d302ac657 Mon Sep 17 00:00:00 2001
+From 7b4540118f9d125ed8cf51f80aa429d1a7f5bc94 Mon Sep 17 00:00:00 2001
 From: Andrew Lunn <andrew@lunn.ch>
 Date: Wed, 12 Nov 2014 23:10:08 +0100
-Subject: [PATCH] mmc: mvsdio: Work around broken TX DMA
+Subject: [PATCH 5/5] mmc: mvsdio: Work around broken TX DMA
 
 In order to use the mvsdio driver for sdio, it has been necessary to
 use a module parameter to disable DMA so to force PIO is used. It is
@@ -32,7 +32,7 @@ Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
-index 6b4c5ad..4f8618f 100644
+index 9f50234..ab95bb7 100644
 --- a/drivers/mmc/host/mvsdio.c
 +++ b/drivers/mmc/host/mvsdio.c
 @@ -111,10 +111,15 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data)

core/linux-armv7/PKGBUILD

@@ -4,44 +4,43 @@
 buildarch=4
 
 pkgbase=linux-armv7
-_srcname=linux-3.17
+_srcname=linux-3.18
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=3.17.4
-pkgrel=2
-rcnrel=armv7-x3
+pkgver=3.18.0
+pkgrel=1
+rcnrel=armv7-x2
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools')
 options=('!strip')
 source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
-        "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
+        #"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
         "http://rcn-ee.net/deb/sid-armhf/v${pkgver}-${rcnrel}/patch-${pkgver%.0}-${rcnrel}.diff.gz"
-        "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver%.*}"
-        #"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN"
+        #"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver%.*}"
+        "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN"
         '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
         '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
         '0003-SMILE-Plug-device-tree-file.patch'
         '0004-fix-mvsdio-eMMC-timing.patch'
-        '0001-mmc-mvsdio-Work-around-broken-TX-DMA.patch'
+        '0005-mmc-mvsdio-Work-around-broken-TX-DMA.patch'
         'config')
-md5sums=('fb30d0f29214d75cddd2faa94f73d5cf'
-         'df86f9de60a651ce3312af09729f7b1e'
-         '8b77463a1143b2a05a290f338bec4217'
+md5sums=('9e854df51ca3fef8bfe566dbd7b89241'
+         '4828f7c68e0bcb8a28b7588a87e3ccf0'
          'SKIP'
-         'b266bbfa3f3c487a87142d0c62daf544'
-         '1c1aa520091fcd25fa135582eddd0671'
-         'cbfb644a50651ef450f9e35570da1b3f'
-         '19330f72bf29ce5271f77d8bf769706f'
-         '8470443040fce04fec4411aa7ddd9f51'
-         'c5b8d7891b5625144bf24ef7d25e7627')
+         '71c2bfdde7cdefb5788aac9d3dc3e35d'
+         '9ba8dec6e78de09a0b0ac50d386a9c46'
+         '0586896c14824b5e988597617f923f5e'
+         'fc1cd549e20f3cf49d7b0af8b01cc900'
+         '1c45963a5bfcb535864a86139346217d'
+         '29462527dec6e3c3529f0dd1ec8bc173')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
 
   # add upstream patch
-  git apply --whitespace=nowarn ../patch-${pkgver}
+  #git apply --whitespace=nowarn ../patch-${pkgver}
 
   # RCN patch
   git apply ../patch-${pkgver%.0}-${rcnrel}.diff
@@ -51,7 +50,7 @@ prepare() {
   git apply ../0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
   git apply ../0003-SMILE-Plug-device-tree-file.patch
   git apply ../0004-fix-mvsdio-eMMC-timing.patch
-  git apply ../0001-mmc-mvsdio-Work-around-broken-TX-DMA.patch
+  git apply ../0005-mmc-mvsdio-Work-around-broken-TX-DMA.patch
 
   # AUFS patches
   cp -ru "${srcdir}/aufs3-standalone/Documentation" .