updpkg: libre/linux-libre 5.9.12-1

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

6 files changed, 103 insertions, 13 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 5e2073d65..c7313f941 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 727065d1ff38991dd7a734fe69d55a8fabbf6f54 Mon Sep 17 00:00:00 2001
+From c3517e2c26868cad0fda418a8815b2e0b818bf92 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 1/4] ZEN: Add sysctl and CONFIG to disallow unprivileged
  CLONE_NEWUSER
 
 Our default behavior continues to match the vanilla kernel.
diff --git a/libre/linux-libre/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch b/libre/linux-libre/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch
index ad25fc620..9640f3928 100644
--- a/libre/linux-libre/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch
+++ b/libre/linux-libre/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch
@@ -1,7 +1,7 @@
-From b2e41088d2a2b3dd99f268833d8079d1a98ee3ea Mon Sep 17 00:00:00 2001
+From 48085266a9b724af6f35ad4eabd31ac8b8bfa064 Mon Sep 17 00:00:00 2001
 From: Sathish Narasimman <nsathish41@gmail.com>
 Date: Thu, 29 Oct 2020 13:18:21 +0530
-Subject: [PATCH 2/2] Bluetooth: Fix: LL PRivacy BLE device fails to connect
+Subject: [PATCH 2/4] Bluetooth: Fix: LL PRivacy BLE device fails to connect
 
 When adding device to white list the device is added to resolving list
 also. It has to be added only when HCI_ENABLE_LL_PRIVACY flag is set.
diff --git a/libre/linux-libre/0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch b/libre/linux-libre/0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
new file mode 100644
index 000000000..3618e89ac
--- /dev/null
+++ b/libre/linux-libre/0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
@@ -0,0 +1,49 @@
+From 3d936926666bb681f2a9ed6e04f685667e61e2b4 Mon Sep 17 00:00:00 2001
+From: Edward Vear <edwardvear@gmail.com>
+Date: Tue, 27 Oct 2020 00:02:03 -0700
+Subject: [PATCH 3/4] Bluetooth: Fix attempting to set RPA timeout when
+ unsupported
+
+During controller initialization, an LE Set RPA Timeout command is sent
+to the controller if supported. However, the value checked to determine
+if the command is supported is incorrect. Page 1921 of the Bluetooth
+Core Spec v5.2 shows that bit 2 of octet 35 of the Supported_Commands
+field corresponds to the LE Set RPA Timeout command, but currently
+bit 6 of octet 35 is checked. This patch checks the correct value
+instead.
+
+This issue led to the error seen in the following btmon output during
+initialization of an adapter (rtl8761b) and prevented initialization
+from completing.
+
+< HCI Command: LE Set Resolvable Private Address Timeout (0x08|0x002e) plen 2
+        Timeout: 900 seconds
+> HCI Event: Command Complete (0x0e) plen 4
+      LE Set Resolvable Private Address Timeout (0x08|0x002e) ncmd 2
+        Status: Unsupported Remote Feature / Unsupported LMP Feature (0x1a)
+= Close Index: 00:E0:4C:6B:E5:03
+
+The error did not appear when running with this patch.
+
+Signed-off-by: Edward Vear <edwardvear@gmail.com>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+---
+ net/bluetooth/hci_core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
+index be9cdf5dabe5..30a5267af490 100644
+--- a/net/bluetooth/hci_core.c
++++ b/net/bluetooth/hci_core.c
+@@ -763,7 +763,7 @@ static int hci_init3_req(struct hci_request *req, unsigned long opt)
+ 			hci_req_add(req, HCI_OP_LE_CLEAR_RESOLV_LIST, 0, NULL);
+ 		}
+ 
+-		if (hdev->commands[35] & 0x40) {
++		if (hdev->commands[35] & 0x04) {
+ 			__le16 rpa_timeout = cpu_to_le16(hdev->rpa_timeout);
+ 
+ 			/* Set RPA timeout */
+-- 
+2.29.2
+
diff --git a/libre/linux-libre/0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch b/libre/linux-libre/0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
new file mode 100644
index 000000000..e8cab4a1c
--- /dev/null
+++ b/libre/linux-libre/0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
@@ -0,0 +1,36 @@
+From b8c149d9a7cf8ec50440d0dcd90ff754ba72b616 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20H=C3=A4dicke?= <felixhaedicke@web.de>
+Date: Thu, 19 Nov 2020 09:22:32 +0100
+Subject: [PATCH 4/4] HID: quirks: Add Apple Magic Trackpad 2 to
+ hid_have_special_driver list
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The Apple Magic Trackpad 2 is handled by the magicmouse driver. And
+there were severe stability issues when both drivers (hid-generic and
+hid-magicmouse) were loaded for this device.
+
+Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=210241
+
+Signed-off-by: Felix Hädicke <felixhaedicke@web.de>
+---
+ drivers/hid/hid-quirks.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
+index bf7ecab5d9e5..142e9dae2837 100644
+--- a/drivers/hid/hid-quirks.c
++++ b/drivers/hid/hid-quirks.c
+@@ -478,6 +478,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
+ #if IS_ENABLED(CONFIG_HID_MAGICMOUSE)
+ 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },
+ 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) },
++	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD2) },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD2) },
+ #endif
+ #if IS_ENABLED(CONFIG_HID_MAYFLASH)
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3) },
+-- 
+2.29.2
+
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 436db3834..d210125a9 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.9.9
+pkgver=5.9.12
 pkgrel=1
 pkgdesc='Linux-libre'
-rcnver=5.9.1
-rcnrel=armv7-x12
+rcnver=5.9.11
+rcnrel=armv7-x14
 url='https://linux-libre.fsfla.org/'
 arch=(i686 x86_64 armv7h)
 license=(GPL2)
@@ -47,6 +47,8 @@ source=(
   # extracted patches from Arch Linux kernel sources
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
   0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch
+  0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
+  0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
   sphinx-workaround.patch
 )
 source_armv7h=(
@@ -71,7 +73,7 @@ validpgpkeys=(
 )
 sha512sums=('e917ed80f1c0e83603c4b57255275f3800568ec170742993521528b7190d9f24b715996ad708839bd67a19560d6ebe364e04bd66c054e076144f44c3d9b63208'
             'SKIP'
-            '0b2d27cf2fae6763871a06c73039488b736e80ab43c658858407b41570a114b5cd6d226b9258180561d66bc1f836fde52686b1f21259308c8e1ff0af4b564f8a'
+            'b8bd7c83291eb2f03db22020652b4a37a71ef038c5f59eb906d2e0eb013ea14931ec50b01a36d81973a41d2335eef2ef5059275345463dfb4f73b6426152ab65'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -80,7 +82,7 @@ sha512sums=('e917ed80f1c0e83603c4b57255275f3800568ec170742993521528b7190d9f24b71
             '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'
             'SKIP'
             '8ee1987ff8735199ce46e9e25d499b01848a22983af446ec319774c270839dc847f78f94439c04ee1b66651cea381d5226286dbbc1d79fadfd3c5d1196cab3a6'
-            'a7e34bb3c986b4e5e0a41a657aafa4fdb9200eaef73ed47723a5d4dc94c2c6beff2bd971f2281aa57b9ff0e3afd4ef9d4065b2bdfd0ab00ce5d5442c04d8570e'
+            'c04045b64c683845b5b8fd47e4ab0f773e1437d5fae5d4d533c4c752b85b0aa175746b478bece80aa5059ff9a7b8bb3f8f941af05dc54c27ea0de9c4b125c531'
             '49f176a1e0201ad4d2ad9e35a01d67bc8a5082cd437c347cae97b78daa9c287e1acf724b5614f7088e262eb28ad0f6a7b192dfcbe3386abf77614d9fc63a543b'
             '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b'
             '167bc73c6c1c63931806238905dc44c7d87c5a5c0f6293159f2133dfe717fb44081018d810675716d1605ec7dff5e8333b87b19e09e2de21d0448e447437873b'
@@ -88,10 +90,12 @@ sha512sums=('e917ed80f1c0e83603c4b57255275f3800568ec170742993521528b7190d9f24b71
             '143dea30c6da00e504c99984a98a0eb2411f558fcdd9dfa7f607d6c14e9e7dffff9cb00121d9317044b07e3e210808286598c785ee854084b993ec9cb14d8232'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            '2714089248984835df2bc57a1f3a5ab9b18a349195c4c7cc87c1d1c3b63a547defb476ab66f0bf6165a285747ca466a9324903c8b4a8b43a39c20cdbeab859e8'
-            '58cc7870f8fa0cd57d9662cab1c21c4af571cc133a5d6d56959ba08faac61e74f36c288407ebddf9beeeb322e7777ee31589f19ab796e95e7d95cc0c8f9b186e'
+            '13c20e15ba0db5f45ec93b684f93a23d9f6ed3d3daff71cd03759f1d895504f49a115c9f5d624686f1f41ccc5582b2fc478bd0f2efdea6ea6e3b38a84e7085a4'
+            '6f6e2213b52e194476fa6df6b9752a4422e1485e9b11ced545ad13d1dfabd06043ca74e022d2671c413098af1d7586229b7c9f9d34d6e0c57218c8f9d21fd1a0'
+            'f912b28f538b7a5ff65f21b5023d01e6039038edba740c4c5d4bfbd6505a11c2af1bcf46c5c8e115508660ca0567a78cc22b9fa6869e8e9a0a3ef6ac9048720e'
+            'f5e05a3e2fdc43d1351d2c8fe21f678b1bb7583f6b071a6a33b07d4b8e8f26bb3169fd958d5bdaa2d545e6df3e01cf1bc804cb281a667803e10c8b0b46e93223'
             '98e97155f86bbe837d43f27ec1018b5b6fdc6c372d6f7f2a0fe29da117d53979d9f9c262f886850d92002898682781029b80d4ee923633fc068f979e6c8254be')
-sha512sums_armv7h=('078c3eeec1dbd429fa48dd7c8d030ba62379aa06a4e2ad70d387e22041a2d42153d050575ae35291fc70ff6ba6cb2a9d097a7f225a2e4500d377438ea8a98251'
+sha512sums_armv7h=('599a6af883044e98fd7e5a048274e130229626217102bd8b1789c0bba541ca7f0edc91861da7e7591ccce4092b14119f639223c3782fdb537c6e09d412e7d39a'
                    'SKIP'
                    'ac5a06427905c33b48817eef0c335d6787b6d1440751450977faf41c649677a7ccb9ec32d0e5bbefcc6cd0fab7ab5920d7dd4e5a29b96f8915e636aca1ec7efd'
                    '7561561e6d1da2f383ac408384ffebe3490f14bcc8f797cf126d0bec5c6c774ebb6de7922c7538991ab70371aacc7fa65be647b17a691aba1a0eb604fdc7d1a7'
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 58ca1a058..ec3e8b8f9 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.9.9-gnu Kernel Configuration
+# Linux/x86 5.9.12-gnu Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
@@ -8158,6 +8158,7 @@ CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_VIRT_DMA=y
 CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
 CONFIG_INFINIBAND_QIB=m