Update to 5.9.13rc1-1

6 files changed, 59 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 193964f99a4a..63e6e4343150 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-rc
-	pkgver = 5.9.12rc1
+	pkgver = 5.9.13rc1
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -8,26 +8,28 @@ pkgbase = linux-rc
 	makedepends = kmod
 	makedepends = libelf
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.9.12-rc1.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.9.12-rc1.sign
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.11.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.11.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.9.13-rc1.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.9.13-rc1.sign
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.12.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.12.tar.sign
 	source = config
 	source = 0000-sphinx-workaround.patch
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 	source = 0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch
 	source = 0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
+	source = 0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	b2sums = 113ad674b77fca621bcf79d87373abf4979aefba4071c49e3f8a1d8221eb9ef67da37193eb7e6dbcbe159674ec2efa19ad8346be3257de5dedccb5baaf138b2a
+	b2sums = 2c30e2026f5ed894ed453ad3e1d03b57eb4aee6249f0f5b349678edfdb0ffb2f4864765c90aa10f62b57ca5631250e32787f9ecc472cbecfe9f35e4adb2a7baf
 	b2sums = SKIP
-	b2sums = fbcf8b93e4a37e0f45c2de4275ecdfdb80ade1a6cf7e2b62cb331cce2d8fc247eedc14c5c37583b6e10cce58515ec3c9e541f21d067ee8d19567f9edcf065b62
+	b2sums = 9e7a86c22993f4bf1a2eda9edd8aacf768ddfb67d109eba78f0719a27d0243767b197a205142524b158c176fe5e1a08de091f4c8f35612267737f2a5ba2dbdc9
 	b2sums = SKIP
 	b2sums = 5b3de497c291d115c19e1856d08ae16f8ceb27061374deb763a4391b98c4aa7bd7e7afb0461c29d9245fba84b2827420104edd4902978dee2bda2c5738212b85
 	b2sums = b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95
-	b2sums = ed1979dfdcc03ce0d052c407dff85f94325b713a0f2a7e6b39d79bf6e8e5463956b371d0ebb7056f07a1bc21f2f806a4a2a7de2cc8f61c59b2d733ca29b34e48
-	b2sums = bd67ff3a8a1554e642a55ed99b9317a3c7538da94630ed09bab0e0af3f556c538e3e7e7a53b1961f107034645ae1c0dac5e705406b83073fc81f59c0b937d5f4
-	b2sums = 5e725df39b824199eb25031730d32a982b5d79076584e131b2930f719bc84cbdd93e5cdd487e975111b568d39422f0bf6aa200d147f2281ff14e8e0d908a29dd
+	b2sums = 4212b9f8d634038353c78fa4e33b7525789ea29fbb72bdeb4e263e1ae0c61b9ee22d6829b664b26fe2c7dff28a9d1f1fb2e558b9f90b32f78d8b2680816665ea
+	b2sums = 2456d8a70e3c6f992ae5956efc3d0bee35480b55cf47088b5b31722059a213409fd0e4ba601e2b00ad25202fa44b336cf402e7d2def3ffe2861874a643f7d29a
+	b2sums = 66cd32b08aee217d1031461161f1730c9c05c1585df9c1bdde857adf08477b4517d89766e90500704f28fb251101441efe22242f5290a7d2bc6095820e397adf
+	b2sums = d07187d63303cd07a567aa5a7afdd908905c07e6f6f5c4154b1c2900c2020465970aeaa40ba36537b98014c7b111e32c440123eeb71a9a64160e5affa8660b9d
 
 pkgname = linux-rc
 	pkgdesc = The release candidate kernel and modules
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index 31ef86fc54b5..8f92b6c86bc4 100644
--- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,4 +1,4 @@
-From 730629bfe4efc95aaee0de463ea410e31153cef9 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/5] ZEN: Add sysctl and CONFIG to disallow unprivileged
diff --git a/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch b/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch
index 61ae53b4b1e9..963305f370a6 100644
--- a/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch
+++ b/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch
@@ -1,4 +1,4 @@
-From 08f9b12aec2533a309a5f6d7ff47d01ee3179a35 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/5] Bluetooth: Fix: LL PRivacy BLE device fails to connect
diff --git a/0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch b/0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
index 1c796dbceb63..f108122ccb83 100644
--- a/0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
+++ b/0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
@@ -1,4 +1,4 @@
-From 4264c74c96e7907b60ee6ed82670317d19ed7ebe Mon Sep 17 00:00:00 2001
+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/5] Bluetooth: Fix attempting to set RPA timeout when
diff --git a/0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch b/0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
new file mode 100644
index 000000000000..8dad0a08d8ac
--- /dev/null
+++ b/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/5] 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/PKGBUILD b/PKGBUILD
index 240baabd87b5..f18b4773318b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _srcname=linux-5.9
 _major=5.9
 ### on initial release this is null otherwise it is the current stable subversion
 ### ie 1,2,3 corresponding $_major.1, $_major.3 etc
-_minor=11
+_minor=12
 _minorc=$((_minor+1))
 ### on initial release this is just $_major
 _fullver=$_major.$_minor
@@ -32,20 +32,22 @@ source=(
   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
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-b2sums=('113ad674b77fca621bcf79d87373abf4979aefba4071c49e3f8a1d8221eb9ef67da37193eb7e6dbcbe159674ec2efa19ad8346be3257de5dedccb5baaf138b2a'
+b2sums=('2c30e2026f5ed894ed453ad3e1d03b57eb4aee6249f0f5b349678edfdb0ffb2f4864765c90aa10f62b57ca5631250e32787f9ecc472cbecfe9f35e4adb2a7baf'
         'SKIP'
-        'fbcf8b93e4a37e0f45c2de4275ecdfdb80ade1a6cf7e2b62cb331cce2d8fc247eedc14c5c37583b6e10cce58515ec3c9e541f21d067ee8d19567f9edcf065b62'
+        '9e7a86c22993f4bf1a2eda9edd8aacf768ddfb67d109eba78f0719a27d0243767b197a205142524b158c176fe5e1a08de091f4c8f35612267737f2a5ba2dbdc9'
         'SKIP'
         '5b3de497c291d115c19e1856d08ae16f8ceb27061374deb763a4391b98c4aa7bd7e7afb0461c29d9245fba84b2827420104edd4902978dee2bda2c5738212b85'
         'b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95'
-        'ed1979dfdcc03ce0d052c407dff85f94325b713a0f2a7e6b39d79bf6e8e5463956b371d0ebb7056f07a1bc21f2f806a4a2a7de2cc8f61c59b2d733ca29b34e48'
-        'bd67ff3a8a1554e642a55ed99b9317a3c7538da94630ed09bab0e0af3f556c538e3e7e7a53b1961f107034645ae1c0dac5e705406b83073fc81f59c0b937d5f4'
-        '5e725df39b824199eb25031730d32a982b5d79076584e131b2930f719bc84cbdd93e5cdd487e975111b568d39422f0bf6aa200d147f2281ff14e8e0d908a29dd')
+        '4212b9f8d634038353c78fa4e33b7525789ea29fbb72bdeb4e263e1ae0c61b9ee22d6829b664b26fe2c7dff28a9d1f1fb2e558b9f90b32f78d8b2680816665ea'
+        '2456d8a70e3c6f992ae5956efc3d0bee35480b55cf47088b5b31722059a213409fd0e4ba601e2b00ad25202fa44b336cf402e7d2def3ffe2861874a643f7d29a'
+        '66cd32b08aee217d1031461161f1730c9c05c1585df9c1bdde857adf08477b4517d89766e90500704f28fb251101441efe22242f5290a7d2bc6095820e397adf'
+        'd07187d63303cd07a567aa5a7afdd908905c07e6f6f5c4154b1c2900c2020465970aeaa40ba36537b98014c7b111e32c440123eeb71a9a64160e5affa8660b9d')
 
 
 export KBUILD_BUILD_HOST=archlinux