linux-libre-apparmor: update armv7h patches

11 files changed, 39 insertions, 66 deletions

diff --git a/kernels/linux-libre-apparmor/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/kernels/linux-libre-apparmor/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
index 9581d071b..b0463fae8 100644
--- a/kernels/linux-libre-apparmor/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ b/kernels/linux-libre-apparmor/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@@ -1,7 +1,7 @@
-From 2a2ab2b8ed60e043da32ddac674d7c58a63c1c8f Mon Sep 17 00:00:00 2001
+From 917b58ee1f0fe801d59103e3bb8eb147f256c2f5 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
-Subject: [PATCH 01/10] ARM: atags: add support for Marvell's u-boot
+Subject: [PATCH 1/9] 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 979ff4016404..d1d0c1950fa4 100644
  };
  
 -- 
-2.11.1
+2.12.1
 
diff --git a/kernels/linux-libre-apparmor/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/kernels/linux-libre-apparmor/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
index 9f31aa580..2ab3143ef 100644
--- a/kernels/linux-libre-apparmor/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ b/kernels/linux-libre-apparmor/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@@ -1,8 +1,8 @@
-From 2890deaac9ce485f0b20211872784b0071d82717 Mon Sep 17 00:00:00 2001
+From 8f2e8ce8901c2da8c69ba68a472e2091be3bb512 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
-Subject: [PATCH 02/10] ARM: atags/fdt: retrieve MAC addresses from Marvell
- boot loader
+Subject: [PATCH 2/9] 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
 addresses are extracted there and assigned to node aliases eth0..3
@@ -43,5 +43,5 @@ index 9448aa0c6686..ac7b6ae6c00f 100644
  	}
  
 -- 
-2.11.1
+2.12.1
 
diff --git a/kernels/linux-libre-apparmor/0003-SMILE-Plug-device-tree-file.patch b/kernels/linux-libre-apparmor/0003-SMILE-Plug-device-tree-file.patch
index 9ad4ac228..adb4ad070 100644
--- a/kernels/linux-libre-apparmor/0003-SMILE-Plug-device-tree-file.patch
+++ b/kernels/linux-libre-apparmor/0003-SMILE-Plug-device-tree-file.patch
@@ -1,7 +1,7 @@
-From fcd4be4707777620a01f1b1097fdb8f93e4c1077 Mon Sep 17 00:00:00 2001
+From 4905eee60c7a744fb9b15ec357dccd01d0caaba9 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:41:19 -0600
-Subject: [PATCH 03/10] SMILE Plug device tree file
+Subject: [PATCH 3/9] 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.
@@ -205,5 +205,5 @@ index 000000000000..d01308ab848b
 +	};
 +};
 -- 
-2.11.1
+2.12.1
 
diff --git a/kernels/linux-libre-apparmor/0004-fix-mvsdio-eMMC-timing.patch b/kernels/linux-libre-apparmor/0004-fix-mvsdio-eMMC-timing.patch
index 189d73b44..b599ba410 100644
--- a/kernels/linux-libre-apparmor/0004-fix-mvsdio-eMMC-timing.patch
+++ b/kernels/linux-libre-apparmor/0004-fix-mvsdio-eMMC-timing.patch
@@ -1,7 +1,7 @@
-From 14c522e0476341f7684cef8b1ad0c03a3e4509e6 Mon Sep 17 00:00:00 2001
+From 0188343b28b4019a7502ca492f55fb2e7f9eb6f2 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:43:56 -0600
-Subject: [PATCH 04/10] fix mvsdio eMMC timing
+Subject: [PATCH 4/9] 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 42296e55b9de..e5ce6d27ec82 100644
  		host->clock = ios->clock;
  		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
 -- 
-2.11.1
+2.12.1
 
diff --git a/kernels/linux-libre-apparmor/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/kernels/linux-libre-apparmor/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
index eb5f11b8b..b9c1238df 100644
--- a/kernels/linux-libre-apparmor/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/kernels/linux-libre-apparmor/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@@ -1,8 +1,7 @@
-From 92ba4f4447bc5ed008f449e2d44ed339df3f4d0f Mon Sep 17 00:00:00 2001
+From d24fd01bc56e4dccfb16826da9cf53e92efc24f7 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
-Subject: [PATCH 05/10] net/smsc95xx: Allow mac address to be set as a
- parameter
+Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter
 
 ---
  drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
@@ -92,5 +91,5 @@ index 831aa33d078a..03625547d794 100644
  
  	/* maybe the boot loader passed the MAC address in devicetree */
 -- 
-2.11.1
+2.12.1
 
diff --git a/kernels/linux-libre-apparmor/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch b/kernels/linux-libre-apparmor/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
index ebf56d216..d7bc54642 100644
--- a/kernels/linux-libre-apparmor/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
+++ b/kernels/linux-libre-apparmor/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
@@ -1,7 +1,7 @@
-From 73eeb8c53d5402e318c7414ca89197faacc82a7d Mon Sep 17 00:00:00 2001
+From e2ee2a2f50947c4bdc4c9d827bd8ae0c383a7549 Mon Sep 17 00:00:00 2001
 From: dobatog <dobatog@gmail.com>
 Date: Thu, 26 Feb 2015 12:32:27 +0100
-Subject: [PATCH 06/10] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
+Subject: [PATCH 6/9] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
  related to input routing signals.
 
 The following patch, based on stable v3.19,  corrects the errors that are reported in the boot trace in reference to the Input Signals of the audio codec TLV320AIC23:
@@ -45,5 +45,5 @@ index 410cae0f2060..0bb8e2602d8e 100644
  	/* input mux */
  	{"Capture Source", "Line", "Line Input"},
 -- 
-2.11.1
+2.12.1
 
diff --git a/kernels/linux-libre-apparmor/0007-set-default-cubietruck-led-triggers.patch b/kernels/linux-libre-apparmor/0007-set-default-cubietruck-led-triggers.patch
index e4b8868be..bfcd558f9 100644
--- a/kernels/linux-libre-apparmor/0007-set-default-cubietruck-led-triggers.patch
+++ b/kernels/linux-libre-apparmor/0007-set-default-cubietruck-led-triggers.patch
@@ -1,7 +1,7 @@
-From ab716cec125455302c0e09ce6709033933b618df Mon Sep 17 00:00:00 2001
+From 18e61c475bb02949da35cf579737a8bec90ffc64 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 14 Feb 2015 12:32:27 +0100
-Subject: [PATCH 07/10] set default cubietruck led triggers
+Subject: [PATCH 7/9] set default cubietruck led triggers
 
 Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 ---
@@ -29,5 +29,5 @@ index 83f39b0362cb..15e9626ea81b 100644
  	};
  
 -- 
-2.11.1
+2.12.1
 
diff --git a/kernels/linux-libre-apparmor/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/kernels/linux-libre-apparmor/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
index 824c0b390..0e7c2c7e9 100644
--- a/kernels/linux-libre-apparmor/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+++ b/kernels/linux-libre-apparmor/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
@@ -1,7 +1,7 @@
-From 357aaf663585092fc717d6bb8397b6ef8764a660 Mon Sep 17 00:00:00 2001
+From d1adb6eb7ec4898bbca97f7dc4ffdb2f6fdc9b99 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Thu, 11 Aug 2016 00:42:37 -0600
-Subject: [PATCH 08/10] exynos4412-odroid: set higher minimum buck2 regulator
+Subject: [PATCH 8/9] exynos4412-odroid: set higher minimum buck2 regulator
  voltage
 
 Set a higher minimum voltage to help reboot issue.
@@ -26,5 +26,5 @@ index 8aa19ba14436..8e2d94e3af72 100644
  				regulator-always-on;
  				regulator-boot-on;
 -- 
-2.11.1
+2.12.1
 
diff --git a/kernels/linux-libre-apparmor/0010-disable-USB3-port-on-ODROID-XU.patch b/kernels/linux-libre-apparmor/0009-disable-USB3-port-on-ODROID-XU.patch
index bb2be4c5d..c40b3b032 100644
--- a/kernels/linux-libre-apparmor/0010-disable-USB3-port-on-ODROID-XU.patch
+++ b/kernels/linux-libre-apparmor/0009-disable-USB3-port-on-ODROID-XU.patch
@@ -1,7 +1,7 @@
-From 891345676e0af18d5d809b8a810db56a363aaf3b Mon Sep 17 00:00:00 2001
+From 7cc217a4e96f65ef0156b590f9fad5da4958f846 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 25 Feb 2017 19:39:51 -0700
-Subject: [PATCH 10/10] disable USB3 port on ODROID-XU
+Subject: [PATCH 9/9] disable USB3 port on ODROID-XU
 
 Ports report over-current condition and are non-operable.
 
@@ -23,5 +23,5 @@ index c4de1353e5df..f80fa58995c5 100644
  
  &usbdrd_dwc3_1 {
 -- 
-2.11.1
+2.12.1
 
diff --git a/kernels/linux-libre-apparmor/0009-drm-armada-tracing-fix.patch b/kernels/linux-libre-apparmor/0009-drm-armada-tracing-fix.patch
deleted file mode 100644
index c9e4e7958..000000000
--- a/kernels/linux-libre-apparmor/0009-drm-armada-tracing-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From a5f7ae6a9dc41c26bcc0d4e66f18c352435ba4eb Mon Sep 17 00:00:00 2001
-From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Mon, 26 Dec 2016 12:56:09 -0700
-Subject: [PATCH 09/10] drm/armada tracing fix
-
-https://lists.freedesktop.org/archives/dri-devel/2016-December/126212.html
----
- drivers/gpu/drm/armada/Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/gpu/drm/armada/Makefile b/drivers/gpu/drm/armada/Makefile
-index a18f156c8b66..64c0b4546fb2 100644
---- a/drivers/gpu/drm/armada/Makefile
-+++ b/drivers/gpu/drm/armada/Makefile
-@@ -4,3 +4,5 @@ armada-y	+= armada_510.o
- armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
- 
- obj-$(CONFIG_DRM_ARMADA) := armada.o
-+
-+CFLAGS_armada_trace.o := -I$(src)
--- 
-2.11.1
-
diff --git a/kernels/linux-libre-apparmor/PKGBUILD b/kernels/linux-libre-apparmor/PKGBUILD
index eda710763..156475f20 100644
--- a/kernels/linux-libre-apparmor/PKGBUILD
+++ b/kernels/linux-libre-apparmor/PKGBUILD
@@ -56,8 +56,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         '0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch'
         '0007-set-default-cubietruck-led-triggers.patch'
         '0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch'
-        '0009-drm-armada-tracing-fix.patch'
-        '0010-disable-USB3-port-on-ODROID-XU.patch')
+        '0009-disable-USB3-port-on-ODROID-XU.patch')
 sha512sums=('44d1774a1d43a15322297d351737fbcbf92c6f433266ce2b17587437d433562cf5811fdae48fafd5a8e00d18ed9ac2e1ad4b12a657f322eb234384316ad131e0'
             'SKIP'
             '3b8bf353cd98417c6f0eac1a40b79cfdd59f772f9bd287bb59d809f7c0d8108dfe678c7662a896c31d8102cb5ffc47436570b93691b0b34b0b3baa0f0afa9d48'
@@ -77,16 +76,15 @@ sha512sums=('44d1774a1d43a15322297d351737fbcbf92c6f433266ce2b17587437d433562cf58
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
             '1089ffb0718c6b40a6f2a3080845ebeb1a1561de35a28e46d74ab0232b98719400f85fdbf3a98fafd0105ed0fe11ec0bd726c7cc47a4a79767ab744875e9538e'
             'SKIP'
-            'dd4e2482d6e3d91d00e37e665933515a4fa876d39c036d639f21c48a09f03202f3dec0dbe04b7c60c4b7e1f49617b5f94ace688afacbe33dc6d6818c0c797031'
-            'cf0a3061cef91c04fa5e6d50c4ee235f817cb97f6b7a77f42d42ada707e71bd9731dfafdfcf396e767362998acd8b98ad9942a989c2dd8457e57177c354ec7d2'
-            '6866b84fac93df7eb669f71ed0041270a5f7254bddf6e4f3de7820dbf5696f09eb3051843f7f48d9ae418487ed765b203eccf4bf399d0ca95061ba0399043839'
-            'f41af76bbb6727fa415bb4e7e5da1896a5f01316354d5f34bc55b3f4451e571f2302c4e66c2b949bb330241d4187d507faba83b1584907d1b66a82a60a1c8923'
-            'ddf31c7db4c873c258763ddff4419315af3d06dc28f14f8d48b0d99e35ecd953d02a992da414c8dd1b9fd9f2bb12580393a541a3064051ece1fa6e173fc52ba2'
-            'df749d4d4f71b4514f526941af592cc11eec13214375e7c0088b84558b56508bf444ea70fb93a0c114a03cd4efd559ea816deb670064fa91f02c7b7f7483d57d'
-            'd1c6d28d22724f9d3700f5d8350164ddba7e6f64980a8d25ebb7cbcffa83250125f337e91510a925deb10bc1e30ac999cb18f3427e051e00d82f5bbaf8a848ec'
-            'd14cedaf275ea1337b18a75d72b7610cb96f982896542edc0a59306c10888d62594b8a36197e33d079e6d5a9b5d20f46892b96a2d3aab5258013f0e5991e3f9b'
-            '0a806db7df7761f5dc64b8a3b3860c6c9216cecfe135778f3019e51e1245bcc34980c6124a11447285b18e284547ffc57a4b2c1290b4dd91a55b0237a7007cc9'
-            'c02d0e1d6b399c84323937a81b702fd3ac7c6f9e08254d1697858f829fd045ee33d5952d42eb22558c290efe7fd5d8fdd7695d8ef3526742a67052fb9e303ebe')
+            '1d550ee87d3c35b4022c23feb771f9a40c34bead6eb8dc5e92cd767417723b32bcb7e0608419aa2b8a4f3306c183447d9ae713d33df68102b1c2df4e267cee39'
+            'cca509462861ac85e6229bd2bf5f5e0e4d2d2db182cf1d562f765862eb192ade5917a9e0306375642c1090143fae6826129fd531435658d906e6a8f88982ddef'
+            '8bff227b9b52b7cf9981c7224a1032abce2955488e4c21494f11c07c96d3999fe920d494ff715baa7bf6071d828f7d22533640b7bc9ac0ad7ab47021156e0f69'
+            '6b870843e8bfee9944befaddf3c4544442d550ccb2d91e5b9eddbb7ea5f48115c6815d4635d6418d3cb8d1013e9dbaf6a3c16fb75f778e215a32d582543ed38e'
+            '7864004635ed568d951eb85ba55b342b844a655abe160b30590b1d980afc12cdbc8ce235e76c92d7ff287c3847d31e5085a215ba42c453c60dca079790103d04'
+            'c00a187921dddbf6712b74af4c439d87a646ec8db3e28e59e279f919e889b9369593dabdc1e4943901b3b0a0ed50a3e910fde03e19f74f74de9591799aee9680'
+            'c33811f633adbefad6e6a1dc73e9b64a594fae3dc06b0970f4f59b11372c3c1a626fda8ff2effca09a2a7630d1dbe4d81aaf371eb04a71d72b345576da8521da'
+            'e51b1d296daa73759d9e932a4d0f72f7e4d6b53c7fa0edb0191f0cd69affe6deba2a4dd6a28165d4861d9b7117fc21190997e691d34b32bb9c96b7dc7c358c63'
+            'b36238543e6dcaa3b6086618fb0eab108480d1224898548205f56a174911d38ce140b8206636c093ad6670987e09bd8a55c7d84ab5512bc6cda45260a1031a59')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
               'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva
@@ -127,8 +125,7 @@ prepare() {
     patch -p1 -i "${srcdir}/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch"
     patch -p1 -i "${srcdir}/0007-set-default-cubietruck-led-triggers.patch"
     patch -p1 -i "${srcdir}/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch"
-    patch -p1 -i "${srcdir}/0009-drm-armada-tracing-fix.patch"
-    patch -p1 -i "${srcdir}/0010-disable-USB3-port-on-ODROID-XU.patch"
+    patch -p1 -i "${srcdir}/0009-disable-USB3-port-on-ODROID-XU.patch"
   fi
 
   # add freedo as boot logo