From 78ec06007347e02c59d7d2f6f146d0907878bcba Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Sat, 9 Jan 2021 18:39:15 +0100 Subject: [PATCH] 5.4.88, 5.10.6 --- PKGBUILD | 8 +- linux-tkg-config/prepare | 4 +- .../5.10/0012-misc-additions.patch | 73 ------------------- 3 files changed, 6 insertions(+), 79 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 0cfc4d8..d78db22 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -48,7 +48,7 @@ else fi pkgname=("${pkgbase}" "${pkgbase}-headers") pkgver="${_basekernel}"."${_sub}" -pkgrel=109 +pkgrel=110 pkgdesc='Linux-tkg' arch=('x86_64') # no i686 in here url="http://www.kernel.org/" @@ -91,7 +91,7 @@ case $_basever in 0012-linux-hardened.patch ) sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491' - 'cb107fecf0606a87f46694f0afbb80011190b47cd99c9063d98284012811bb83' + '3bf346da06f6d7ea463adf4a77a0a1186cc2a1c2a600f450074266c59c06b238' 'SKIP' '55dd5117c1da17c9ec38d7bc995958958bcc8b7ebcfd81de1d4c7650b85537ab' '1f4a20d6eaaa0d969af93152a65191492400c6aa838fc1c290b0dd29bb6019d8' @@ -318,7 +318,7 @@ case $_basever in 0012-misc-additions.patch ) sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43' - '20a9a6742728677d0959197bc00cb9963ecffc6164d0e082364c11b9c9961349' + '603d545b9d72fbfc4d9dc2f100e8c69ffd0f73b656e9d4c2a43fef6d23274169' 'SKIP' '458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a' '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898' @@ -340,7 +340,7 @@ case $_basever in 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'e308292fc42840a2366280ea7cf26314e92b931bb11f04ad4830276fc0326ee1' '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104' - '37626f613311113762224ee52b1e24b508d40b85d11d346ca6708545ce91f49b') + '034e3958993a616b98d172d68658e844f7bfd445da742fbce4a24995e5de1d8d') ;; 511) opt_ver="5.8%2B" diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare index 10d8560..9f0d301 100644 --- a/linux-tkg-config/prepare +++ b/linux-tkg-config/prepare @@ -1,10 +1,10 @@ #!/bin/bash -ver54=87 +ver54=88 ver57=19 ver58=18 ver59=16 -ver510=5 +ver510=6 ver511=rc2 _tkg_initscript() { diff --git a/linux-tkg-patches/5.10/0012-misc-additions.patch b/linux-tkg-patches/5.10/0012-misc-additions.patch index a82884e..d751223 100644 --- a/linux-tkg-patches/5.10/0012-misc-additions.patch +++ b/linux-tkg-patches/5.10/0012-misc-additions.patch @@ -53,53 +53,6 @@ index e9d39c48520a..3bceead8da40 100644 /* Note: the ioctl VT_GETSTATE does not work for consoles 16 and higher (since it returns a short) */ -From 0438f3011663ce01a981bb8b3af0e84e73551ecf Mon Sep 17 00:00:00 2001 -From: Edward Vear -Date: Tue, 27 Oct 2020 00:02:03 -0700 -Subject: 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 -Signed-off-by: Marcel Holtmann ---- - 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 502552d6e9af..c4aa2cbb9269 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 */ --- -cgit v1.2.3-1-gf6bb5 From e5e77ad2223f662e1615266d8ef39a8db7e65a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20H=C3=A4dicke?= @@ -232,32 +185,6 @@ index fe1c538cd718..c27743a58f81 100644 -- cgit v1.2.3-1-gf6bb5 -From 00f09a6a8193b46c83ae1c8ff6623db011f90099 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Fri, 1 Jan 2021 06:20:32 +0100 -Subject: ALSA: hda/hdmi: fix locking in silent_stream_disable - -The code unlocked the wrong lock, leading to deadlocks. ---- - sound/pci/hda/patch_hdmi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c -index 2ddc27db8c01..d12b4799c3cb 100644 ---- a/sound/pci/hda/patch_hdmi.c -+++ b/sound/pci/hda/patch_hdmi.c -@@ -1736,7 +1736,7 @@ static void silent_stream_disable(struct hda_codec *codec, - per_pin->silent_stream = false; - - unlock_out: -- mutex_unlock(&spec->pcm_lock); -+ mutex_unlock(&per_pin->lock); - } - - /* update ELD and jack state via audio component */ --- -cgit v1.2.3-1-gf6bb5 - From e437ac931e89629f952ce9f3f9dfe45ac505cd0d Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Tue, 5 Jan 2021 19:46:01 +0000