linux-libre-knock-4.2.6_gnu-1: updating version

10 files changed, 54 insertions, 48 deletions

diff --git a/kernels/linux-libre-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/kernels/linux-libre-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
index 2f1f0f02e..db4f9565b 100644
--- a/kernels/linux-libre-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ b/kernels/linux-libre-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@@ -1,4 +1,4 @@
-From c3378026429b3ff9f2236fe0700db7eb7e450a46 Mon Sep 17 00:00:00 2001
+From 3f6a51e3dfaa871a8a114753c666adc1442f2496 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
 Subject: [PATCH 1/8] ARM: atags: add support for Marvell's u-boot
@@ -47,4 +47,5 @@ index 979ff40..d1d0c19 100644
  };
  
 -- 
-2.4.4
+2.4.5
+
diff --git a/kernels/linux-libre-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/kernels/linux-libre-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
index 15da9c081..297f2e553 100644
--- a/kernels/linux-libre-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
+++ b/kernels/linux-libre-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
@@ -1,6 +1,6 @@
-From 98e458c66c85472984a4230f34e7386af9e7b8d6 Mon Sep 17 00:00:00 2001
+From e479cd018fcd7f32714e5172265f8d1e7c4d9f0d Mon Sep 17 00:00:00 2001
 From: Jason Self <j@jxself.org>
-Date: Wed, 5 Aug 2015 09:16:03 -0700
+Date: Sun, 30 Aug 2015 14:27:44 -0700
 Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the
  firmwares.
 
@@ -10,10 +10,10 @@ Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the
  2 files changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
-index 720e599..d6a92ba 100644
+index 103f5d0..98f923b4 100644
 --- a/drivers/gpu/drm/radeon/r600.c
 +++ b/drivers/gpu/drm/radeon/r600.c
-@@ -2442,7 +2442,7 @@ int r600_init_microcode(struct radeon_device *rdev)
+@@ -2489,7 +2489,7 @@ int r600_init_microcode(struct radeon_device *rdev)
  	}
  
  	DRM_INFO("Loading %s Microcode\n", chip_name);
@@ -22,7 +22,7 @@ index 720e599..d6a92ba 100644
  	snprintf(fw_name, sizeof(fw_name), "/*(DEBLOBBED)*/", chip_name);
  	err = reject_firmware(&rdev->pfp_fw, fw_name, rdev->dev);
  	if (err)
-@@ -2494,7 +2494,7 @@ int r600_init_microcode(struct radeon_device *rdev)
+@@ -2541,7 +2541,7 @@ int r600_init_microcode(struct radeon_device *rdev)
  			err = -EINVAL;
  		}
  	}
@@ -31,7 +31,7 @@ index 720e599..d6a92ba 100644
  out:
  	if (err) {
  		if (err != -EINVAL)
-@@ -3154,7 +3154,7 @@ int r600_init(struct radeon_device *rdev)
+@@ -3201,7 +3201,7 @@ int r600_init(struct radeon_device *rdev)
  	r = radeon_bo_init(rdev);
  	if (r)
  		return r;
@@ -40,7 +40,7 @@ index 720e599..d6a92ba 100644
  	if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) {
  		r = r600_init_microcode(rdev);
  		if (r) {
-@@ -3162,7 +3162,7 @@ int r600_init(struct radeon_device *rdev)
+@@ -3209,7 +3209,7 @@ int r600_init(struct radeon_device *rdev)
  			return r;
  		}
  	}
@@ -50,7 +50,7 @@ index 720e599..d6a92ba 100644
  	radeon_pm_init(rdev);
  
 diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
-index af15260..f138df9 100644
+index cd3f6ac..b09af51 100644
 --- a/drivers/gpu/drm/radeon/r600_cp.c
 +++ b/drivers/gpu/drm/radeon/r600_cp.c
 @@ -2241,7 +2241,7 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
diff --git a/kernels/linux-libre-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/kernels/linux-libre-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
index 61d60c889..b44834c27 100644
--- a/kernels/linux-libre-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ b/kernels/linux-libre-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@@ -1,4 +1,4 @@
-From 8e6e2743ebdc2f46f59190391db3d2f37290047f Mon Sep 17 00:00:00 2001
+From 693aa021add61922682c5cf6f5678f04fe7b94ef Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
 Subject: [PATCH 2/8] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
@@ -43,4 +43,5 @@ index 9448aa0..ac7b6ae 100644
  	}
  
 -- 
-2.4.4
+2.4.5
+
diff --git a/kernels/linux-libre-knock/0003-SMILE-Plug-device-tree-file.patch b/kernels/linux-libre-knock/0003-SMILE-Plug-device-tree-file.patch
index 3e5faf6b5..2d573ca04 100644
--- a/kernels/linux-libre-knock/0003-SMILE-Plug-device-tree-file.patch
+++ b/kernels/linux-libre-knock/0003-SMILE-Plug-device-tree-file.patch
@@ -1,4 +1,4 @@
-From 67570590136361a2bb0ed62beef15151dc1a4572 Mon Sep 17 00:00:00 2001
+From c09c0e15623ad939dbc5483d48adce41085bf2aa 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/8] SMILE Plug device tree file
@@ -14,12 +14,12 @@ 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 992736b..2373ab3 100644
+index 246473a..5586e7a 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -625,6 +625,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
- dtb-$(CONFIG_MACH_ARMADA_370) += \
+@@ -672,6 +672,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
  	armada-370-db.dtb \
+ 	armada-370-dlink-dns327l.dtb \
  	armada-370-mirabox.dtb \
 +	armada-370-smileplug.dtb \
  	armada-370-netgear-rn102.dtb \
@@ -205,4 +205,5 @@ index 0000000..d01308a
 +	};
 +};
 -- 
-2.4.4
+2.4.5
+
diff --git a/kernels/linux-libre-knock/0004-fix-mvsdio-eMMC-timing.patch b/kernels/linux-libre-knock/0004-fix-mvsdio-eMMC-timing.patch
index a147f3bc0..fa7a719e4 100644
--- a/kernels/linux-libre-knock/0004-fix-mvsdio-eMMC-timing.patch
+++ b/kernels/linux-libre-knock/0004-fix-mvsdio-eMMC-timing.patch
@@ -1,4 +1,4 @@
-From 3fe82206833efc04b2625c60eb7f3ea6972d5a53 Mon Sep 17 00:00:00 2001
+From d0899762087c6ff5c8a9b522d4f2fe1f9d527b5f 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/8] fix mvsdio eMMC timing
@@ -34,4 +34,5 @@ index a448498..14441a6 100644
  		host->clock = ios->clock;
  		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
 -- 
-2.4.4
+2.4.5
+
diff --git a/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
index 961e49c51..b8d64bfe4 100644
--- a/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@@ -1,4 +1,4 @@
-From 0cca0b90853cd9e03a5c6d2018d1fb5c790dce59 Mon Sep 17 00:00:00 2001
+From f51bebf4094d0263c125b38b761a0eb2e3bbdbd8 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
 Subject: [PATCH 5/8] net/smsc95xx: Allow mac address to be set as a parameter
@@ -91,4 +91,5 @@ index 26423ad..e29a323 100644
  	if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
  			dev->net->dev_addr) == 0) {
 -- 
-2.4.4
+2.4.5
+
diff --git a/kernels/linux-libre-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch b/kernels/linux-libre-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
index 6ca1f4b74..c05d584ea 100644
--- a/kernels/linux-libre-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
+++ b/kernels/linux-libre-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
@@ -1,4 +1,4 @@
-From 493b50d16cd287231bbe11da07f82184d80ceba2 Mon Sep 17 00:00:00 2001
+From be369dba2e0a95d54cc858b5d8ecada13baf328a Mon Sep 17 00:00:00 2001
 From: dobatog <dobatog@gmail.com>
 Date: Thu, 26 Feb 2015 12:32:27 +0100
 Subject: [PATCH 6/8] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
@@ -27,7 +27,7 @@ Tested-by: Max Filippov <jcmvbkbc@gmail.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
-index cc17e7e..891f3aa 100644
+index cd8c02b..95e6b11 100644
 --- a/sound/soc/codecs/tlv320aic23.c
 +++ b/sound/soc/codecs/tlv320aic23.c
 @@ -174,10 +174,10 @@ static const struct snd_soc_dapm_route tlv320aic23_intercon[] = {
@@ -45,6 +45,5 @@ index cc17e7e..891f3aa 100644
  	/* input mux */
  	{"Capture Source", "Line", "Line Input"},
 -- 
-2.4.4
-
+2.4.5
 
diff --git a/kernels/linux-libre-knock/0007-set-default-cubietruck-led-triggers.patch b/kernels/linux-libre-knock/0007-set-default-cubietruck-led-triggers.patch
index 38c0482a3..bbe7e04d1 100644
--- a/kernels/linux-libre-knock/0007-set-default-cubietruck-led-triggers.patch
+++ b/kernels/linux-libre-knock/0007-set-default-cubietruck-led-triggers.patch
@@ -1,4 +1,4 @@
-From b9c28f3bd758d09374fe35e86d5d5d4aeb7c6a0a Mon Sep 17 00:00:00 2001
+From f141851ab061abfc770b9a0540ee6f6c87e863c0 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sun, 14 Jun 2015 13:20:25 -0600
 Subject: [PATCH 7/8] set default cubietruck led triggers
@@ -9,10 +9,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
-index 8f74a64..1161296 100644
+index 4611e2f..5739f2b 100644
 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
-@@ -205,6 +205,7 @@
+@@ -70,6 +70,7 @@
  		blue {
  			label = "cubietruck:blue:usr";
  			gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;
@@ -20,7 +20,7 @@ index 8f74a64..1161296 100644
  		};
  
  		orange {
-@@ -220,6 +221,7 @@
+@@ -85,6 +86,7 @@
  		green {
  			label = "cubietruck:green:usr";
  			gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>;
@@ -29,4 +29,5 @@ index 8f74a64..1161296 100644
  	};
  
 -- 
-2.4.4
+2.4.5
+
diff --git a/kernels/linux-libre-knock/0008-USB-armory-support.patch b/kernels/linux-libre-knock/0008-USB-armory-support.patch
index eccf0bb62..13b415604 100644
--- a/kernels/linux-libre-knock/0008-USB-armory-support.patch
+++ b/kernels/linux-libre-knock/0008-USB-armory-support.patch
@@ -1,4 +1,4 @@
-From 163421a4fef11bea6cf4bdb4ad9de67fb340bb90 Mon Sep 17 00:00:00 2001
+From ac49b5026524acf13cbdeef8d5f72257aef3e31d Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 7 Mar 2015 16:51:15 -0700
 Subject: [PATCH 8/8] USB armory support
@@ -16,10 +16,10 @@ Subject: [PATCH 8/8] USB armory support
  create mode 100644 arch/arm/boot/dts/imx53-usbarmory.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 2373ab3..27728dd 100644
+index 5586e7a..d54f5f7 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -252,6 +252,9 @@ dtb-$(CONFIG_SOC_IMX53) += \
+@@ -264,6 +264,9 @@ dtb-$(CONFIG_SOC_IMX53) += \
  	imx53-smd.dtb \
  	imx53-tx53-x03x.dtb \
  	imx53-tx53-x13x.dtb \
@@ -28,7 +28,7 @@ index 2373ab3..27728dd 100644
 +	imx53-usbarmory-host.dtb \
  	imx53-voipac-bsb.dtb
  dtb-$(CONFIG_SOC_IMX6Q) += \
- 	imx6dl-aristainetos_4.dtb \
+ 	imx6dl-apf6dev.dtb \
 diff --git a/arch/arm/boot/dts/imx53-usbarmory-common.dtsi b/arch/arm/boot/dts/imx53-usbarmory-common.dtsi
 new file mode 100644
 index 0000000..c7cbd84
@@ -325,4 +325,5 @@ index 0000000..902a73b
 +	status = "okay";
 +};
 -- 
-2.4.4
+2.4.5
+
diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD
index 93cbb1b7c..cc2f59490 100644
--- a/kernels/linux-libre-knock/PKGBUILD
+++ b/kernels/linux-libre-knock/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgbase=linux-libre-knock
 _pkgbasever=4.2-gnu
-_pkgver=4.2.5-gnu
+_pkgver=4.2.6-gnu
 _knockpatchver=4.2_2
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -21,7 +21,7 @@ _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
 pkgrel=1
-rcnrel=armv7-x2
+rcnrel=armv7-x3
 arch=('i686' 'x86_64' 'armv7h')
 url="https://gnunet.org/knock"
 license=('GPL2')
@@ -63,7 +63,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '0008-USB-armory-support.patch')
 sha256sums=('3a8fc9da5a38f15cc4ed0c5132d05b8245dfc1007c37e7e1994b2486535ecf49'
             'SKIP'
-            '3fd7d8305cd9c9f581e9a64806be9949c72176b1fc0247f688febac5eaaf8362'
+            'eeb789dc08b73958694db66763d263071591cb2f16a076acc521b044aaccac30'
             'SKIP'
             'c7c4ab580f00dca4114c185812a963e73217e6bf86406c240d669026dc3f98a4'
             'SKIP'
@@ -78,17 +78,17 @@ sha256sums=('3a8fc9da5a38f15cc4ed0c5132d05b8245dfc1007c37e7e1994b2486535ecf49'
             '8d425ed37cd14ad6de5f5b935eb4563c54dafd25b738f9663f67295e5951c215'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
-            '38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d'
-            '4969456f0bf72be5d23aa86c2edc487217a3708ce6fde4e1a3a8f930444174c9'
+            '61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc'
+            '8516a699054b78ed921bca546af3b955c10eb422ada14787a5b05a45bd193572'
             'SKIP'
-            '203b07cc241f2374d1e18583fc9940cc69da134f992bff65a8b376c717aa7ea7'
-            '28fb8c937c2a0dc824ea755efba26ac5a4555f9a97d79f4e31f24b23c5eae59c'
-            '39bfd7f6e2df0b87b52488462edb2fbcfaf9e3eb2a974fc7b3bc22147352fece'
-            '59444ed7dce62697f1c35be340b740899e1d71398b334c419ad07cea838c6ed6'
-            '90cff98e43322e79c8d8b1c6456a328650f6af3ebf018086a82ab690a688da5d'
-            'ed6cf79434d3b1c10e0e141ab6bdc2aa9abfe7e7df6bbb24b2097c0e0d62ac17'
-            '2c3df3d9a3d8fe11fefc485167a81c6fc53635b04ba0312bef144505dc0a6ce4'
-            '0f6b0146096ee7a04938d39a013c23cfd8719f3bef0956b5c88a33e7d7ecafdc')
+            '2654680bc8f677f647bca6e2b367693bf73ffb2edc21e3757a329375355a335d'
+            '842e4f483fa36c0e7dbe18ad46d78223008989cce097e5bef1e14450280f5dfe'
+            '810697eec07faa60acb59b97df291e5f2e9428e86ae54e5ef90a6e4b2d0844ab'
+            'c743e41975260aab3176b6f473707c8d8371cb89575e1c128bddb3bd74030b8b'
+            'abc9593a479b9bb677112fa1d6502c8165d27d0854a712e1662374e4bafb96a0'
+            'd068215561ce769439901da0118e251c624de58fe414cc2166fbf972f76dd1a7'
+            'ac0fb2180560652f94bebb3c09baef3c34785b539cae541df175ebec6989d79c'
+            'c23c3bf29fd557fe2e9ca72e65cd0f1e790b771b4568d0732388d7d420cefd6a')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
               'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva