updpkg: libre/linux-libre 5.6.7-1

Signed-off-by: David P <megver83@parabola.nu>

4 files changed, 11 insertions, 69 deletions

diff --git a/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index d52980cd2..c2fe2b80a 100644
--- a/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,7 +1,7 @@
-From 31d4f0d32196b85f66945ed01b60ed1b55ee5f54 Mon Sep 17 00:00:00 2001
+From b38ba076b5049a77bf79f2c8cd224a77dea89bf3 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Mon, 16 Sep 2019 04:53:20 +0200
-Subject: [PATCH 1/2] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH] ZEN: Add sysctl and CONFIG to disallow unprivileged
  CLONE_NEWUSER
 
 Our default behavior continues to match the vanilla kernel.
@@ -128,5 +128,5 @@ index 8eadadc478f9..c36ecd19562c 100644
  static DEFINE_MUTEX(userns_state_mutex);
  
 -- 
-2.26.1
+2.26.2
 
diff --git a/libre/linux-libre/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_.patch b/libre/linux-libre/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_.patch
deleted file mode 100644
index 22201365d..000000000
--- a/libre/linux-libre/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From e5016d0b5460c3bed8f78033723ad22775db7725 Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Sat, 18 Apr 2020 11:29:04 +0200
-Subject: [PATCH 2/2] Revert "ACPI: EC: Do not clear boot_ec_is_ecdt in
- acpi_ec_add()"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 281e612b4b9587c0c72e30c49ec279587b20da0f which is
-commit 65a691f5f8f0bb63d6a82eec7b0ffd193d8d8a5f upstream.
-
-Rafael writes:
-	It has not been marked for -stable or otherwise requested to be
-	included AFAICS.  Also it depends on other mainline commits that
-	have not been included into 5.6.5.
-
-Reported-by: Toralf Förster <toralf.foerster@gmx.de>
-Reported-by: Rafael J. Wysocki <rafael@kernel.org>
-Cc: Sasha Levin <sashal@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/acpi/ec.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
-index 29b8fa618a02..35dd2f1fb0e6 100644
---- a/drivers/acpi/ec.c
-+++ b/drivers/acpi/ec.c
-@@ -1646,6 +1646,7 @@ static int acpi_ec_add(struct acpi_device *device)
- 
- 		if (boot_ec && ec->command_addr == boot_ec->command_addr &&
- 		    ec->data_addr == boot_ec->data_addr) {
-+			boot_ec_is_ecdt = false;
- 			/*
- 			 * Trust PNP0C09 namespace location rather than
- 			 * ECDT ID. But trust ECDT GPE rather than _GPE
-@@ -1665,12 +1666,9 @@ static int acpi_ec_add(struct acpi_device *device)
- 
- 	if (ec == boot_ec)
- 		acpi_handle_info(boot_ec->handle,
--				 "Boot %s EC initialization complete\n",
-+				 "Boot %s EC used to handle transactions and events\n",
- 				 boot_ec_is_ecdt ? "ECDT" : "DSDT");
- 
--	acpi_handle_info(ec->handle,
--			 "EC: Used to handle transactions and events\n");
--
- 	device->driver_data = ec;
- 
- 	ret = !!request_region(ec->data_addr, 1, "EC data");
--- 
-2.26.1
-
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index a7afcc18f..b8834433a 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -14,11 +14,11 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix
 _replacesoldmodules=() # '%' gets replaced with kernel suffix
 
 pkgbase=linux-libre
-pkgver=5.6.5
+pkgver=5.6.7
 pkgrel=1
 pkgdesc='Linux-libre'
-rcnver=5.6.2
-rcnrel=armv7-x9
+rcnver=5.6.4
+rcnrel=armv7-x11
 url='https://linux-libre.fsfla.org/'
 arch=(i686 x86_64 armv7h)
 license=(GPL2)
@@ -46,7 +46,6 @@ source=(
   0002-fix-Atmel-maXTouch-touchscreen-support.patch
   # extracted patches from Arch Linux kernel sources
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-  0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_.patch
   sphinx-workaround.patch
 )
 source_armv7h=(
@@ -71,7 +70,7 @@ validpgpkeys=(
 )
 sha512sums=('df473a228ca2bbefbcc630aee710c78c83083269b4939adf698a9adf3a5760391b24529704bfc0b108bc67054ebed047746810e1b41be1fd9019a911a563114d'
             'SKIP'
-            '140bb3bb3f49616d04e57f9c61c43012de19f7c9bcc457389c7c07bb0d567967f6f25e646d62cbb3b88a9d02dae2130addd8c02d0dc511eff38c7ee6b4cec2b7'
+            '0c01eabfbd10fb5aeabcb60c9ca362576bd7b33a31b841704b3b4d3c650a2a681b208ffdeb82673286b0e8449858d399cc80f04acafa7d27ee686f2880471e6d'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -82,16 +81,15 @@ sha512sums=('df473a228ca2bbefbcc630aee710c78c83083269b4939adf698a9adf3a5760391b2
             '06069e3ae24499a993fe60a6e94a65c235fa07c4bc8b43cd9c9d8d26b738bc60b5bdc2c355b05a93dcd10a129e16ea29e23d7dae58c35f8b38e553adf51f65df'
             'b9a77d4851e8df13d4b24be511cb8aaa5f9e789984a881090c62296244b8a260e584c5f5330ad3cce91f17d5ea1e99716ef43aedd6090fe0c865ad1feaad0f92'
             'e4b0210bba48dd432751a7a8d41e3b5ae6f11d05f6551d2987a62011718a3ca706754da02303fe819e064868120e5f963fcf1e07601ff84aa22b9500fce32a4b'
-            'b3347d99e5f472dfa842e76f1cb9973ff15d85c45908f7c0383d15f35964eba7c3a2f6d07bf140812b1e899636712f74645ae35298642744c3e879f77e92bd8c'
+            '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b'
             '167bc73c6c1c63931806238905dc44c7d87c5a5c0f6293159f2133dfe717fb44081018d810675716d1605ec7dff5e8333b87b19e09e2de21d0448e447437873b'
             'bb6718984a7357c9b00c37e4788480e5b8b75018c172ecc1441bc3fc5d2d42444eb5d8c7f9d2e3a7d6fed6d03acb565e3c0559486e494c40a7fe6bd0570c9ede'
             '143dea30c6da00e504c99984a98a0eb2411f558fcdd9dfa7f607d6c14e9e7dffff9cb00121d9317044b07e3e210808286598c785ee854084b993ec9cb14d8232'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            'ee37fdcf13852b38d02b565483caf98eaa3ef83f4cdbb7a77418ac4c198f8c3922ef0bf8ca347b825c6d28b1c43b7d2e482659ee0a6c47affc5f03d2416067ab'
-            '70469b344ae86113b44defb441b9ef50548d76564bc8ec17bdbacc569e384fa300fbe81cda9b4311b1017355c4ecbc4c0ac1372b8ff5c6973b039b986b32b484'
+            'f340f8beaf2df0970ed592360da8d625ba6be27ed4a0773ff8a6b5dc638b0e7b73e575d3e154c328999dfe9ebf4f18739adade8ddfa89472845318885f9da1c0'
             '98e97155f86bbe837d43f27ec1018b5b6fdc6c372d6f7f2a0fe29da117d53979d9f9c262f886850d92002898682781029b80d4ee923633fc068f979e6c8254be')
-sha512sums_armv7h=('a770c6105dc1e88ae07b0f734e0d12622a118dcf82cb17128d5e08ab59c791c3afaa1618d189b5b920aaa4b5c1004671a6c456a4efba32c2159ac22ed1744f0d'
+sha512sums_armv7h=('8f9f0d9da7d2b279a13403a90e43cf3782c1b1711ad7bc758ba3ad717afa1a62fa1ae5519015561a0c632362ed89036d5b5451dd7e1d93f3033c223d84b7cab4'
                    'SKIP'
                    'd788dd09cf98e0b014faeba75633c0db0cda7bc26817f09520cafc763ddad25e5c446b3fc19ba22a9abefcb02a4f3d187808f11caba77420b473f88a3f0a281e'
                    '2010c50048b60f57b4547fdd770a53a26e5d60a40e73c26b4f490e86d0753b6840eade917cb603ef8a7048a175019a921629489e6b9bbce2cc08bde18365934c'
@@ -143,8 +141,6 @@ prepare() {
       echo "Applying patch $src_armv7h..."
       patch -Np1 < "../$src_armv7h"
     done
-    # temporary fix
-    sed -i 's/ioremap_nocache/ioremap/' drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
   fi
 
   local src
diff --git a/libre/linux-libre/linux-armv7h.preset b/libre/linux-libre/linux-armv7h.preset
index 1d1169b4b..bb2ccf854 100644
--- a/libre/linux-libre/linux-armv7h.preset
+++ b/libre/linux-libre/linux-armv7h.preset
@@ -3,7 +3,7 @@
 ALL_config="/etc/mkinitcpio.conf"
 ALL_kver="%KERNVER%"
 
-PRESETS=('default' 'fallback')
+PRESETS=('default')
 
 #default_config="/etc/mkinitcpio.conf"
 default_image="/boot/initramfs-%PKGBASE%.img"