summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO28
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch12
-rw-r--r--0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch67
-rw-r--r--0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch6
-rw-r--r--0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch4
-rw-r--r--0005-drm-amd-display-Add-get_dig_frontend-implementation-.patch112
-rw-r--r--0007-btrfs-Fix-500-2000-performance-regression-w-5.10.patch61
-rw-r--r--0008-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch34
-rw-r--r--PKGBUILD24
9 files changed, 248 insertions, 100 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1060a871840..376c37de5ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-rc
- pkgver = 5.10.3rc1
+ pkgver = 5.10.4rc1
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -12,26 +12,30 @@ pkgbase = linux-rc
makedepends = tar
makedepends = xz
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.3-rc1.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.3-rc1.sign
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.2.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.2.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.4-rc1.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.4-rc1.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.3.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.3.tar.sign
source = config
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
+ source = 0005-drm-amd-display-Add-get_dig_frontend-implementation-.patch
+ source = 0007-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
+ source = 0008-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- b2sums = c244d971c59b248a843070d19274964d817ebf0b111eb8abe20f90711962f5e11d3e591523bf3093a2e16e810dfaf8692b14ee251dc57d417842f358cdf70455
+ b2sums = 21cb6a79b621e502fb6c3bd1474aede7574928ba18ccde119c49849960bf5eb50099b483c582e7e202369b6ee6c13c1e6250a5cf6afeebfc717909b4db12d68c
b2sums = SKIP
- b2sums = 708b51b58f63d8954073d7ab559286fc854c700108505e659474e55b2d0968cea002b8356d5441e6b24d37a4194684a6244293c760da6d442a6c76e268619a18
+ b2sums = 0a8603991e9de4b50c2a0c9b7f96d2d169a41567f81bfc8bfd3d41edd45a948d2a672236c9651d701f16f0cb619c39996c9cc883647bacb2cefb33100e072d98
b2sums = SKIP
b2sums = ac86054c7dc7e47cdc256c652c47cc4dc2100d1110637253fcc986fb5bcbda0023e8525d36253b9111284fd4d68c2a111219d904ac0489fdc251b26fb92d7c86
- b2sums = 4212b9f8d634038353c78fa4e33b7525789ea29fbb72bdeb4e263e1ae0c61b9ee22d6829b664b26fe2c7dff28a9d1f1fb2e558b9f90b32f78d8b2680816665ea
- b2sums = 2456d8a70e3c6f992ae5956efc3d0bee35480b55cf47088b5b31722059a213409fd0e4ba601e2b00ad25202fa44b336cf402e7d2def3ffe2861874a643f7d29a
- b2sums = 66cd32b08aee217d1031461161f1730c9c05c1585df9c1bdde857adf08477b4517d89766e90500704f28fb251101441efe22242f5290a7d2bc6095820e397adf
- b2sums = d07187d63303cd07a567aa5a7afdd908905c07e6f6f5c4154b1c2900c2020465970aeaa40ba36537b98014c7b111e32c440123eeb71a9a64160e5affa8660b9d
+ b2sums = 93567344c75bdd53b08bbae74d9cd6a99223825e37b59a762f7abd83ecf76e90d3a6d62d807d5ffe282aabbad21ae8c0e542fcf45e4419229de804068414d01d
+ b2sums = 155b189c79c1631d1f709ad7b01fc0b1d94e9c7a31ba0eacaa2dcde80020e8b7b36bea2429668fcac440c97a11ea26051cf2912f3f7af070a3878c8d00d53c82
+ b2sums = af8f9ad7ee3f78da380ca97be64179a5cf95216b0f3652a95536f313ac8a7fdb39657ec88ca70474582c56974d096691544afef5c31293194ef004710bcfbefa
+ b2sums = da02f8893032c5658d2ba900355c3a576214e39c369faac6599fbbd2c416fee6f4efa7683f069b0269993a1f395cf373f27e2fc001206b95c7870a8f594c8ce5
+ b2sums = 7733157d74983a5c2de0ab2aa1b41244ffa60e1fe038795fba1868a2410d2a91e23977462233628de85f3fea16921c48964f4c29e0a0af73e46cbd0dda26e05c
+ b2sums = 9550885b97c06a796ff62923f2049cc7c6b6db3a31a1824e7b1bf6d1417e7243c8dff5bb358495c562880a821769c43f4aff258cf3e4e93f0642ac1881282496
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 8f92b6c86bc..07267e8cac6 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,7 +1,7 @@
-From c3517e2c26868cad0fda418a8815b2e0b818bf92 Mon Sep 17 00:00:00 2001
+From 048c6dda33c592ef025b372311eede5e05ef9cb7 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
+Subject: [PATCH 1/9] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
@@ -36,10 +36,10 @@ index 6ef1c7109fc4..2140091b0b8d 100644
{
return &init_user_ns;
diff --git a/init/Kconfig b/init/Kconfig
-index 2a5df1cf838c..bdaf777b9976 100644
+index 0872a5a2e759..a40d8afeb1bb 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1169,6 +1169,22 @@ config USER_NS
+@@ -1173,6 +1173,22 @@ config USER_NS
If unsure, say N.
@@ -63,7 +63,7 @@ index 2a5df1cf838c..bdaf777b9976 100644
bool "PID Namespaces"
default y
diff --git a/kernel/fork.c b/kernel/fork.c
-index 5fe09d4e6d6a..36756b715103 100644
+index 6d266388d380..635146a691c1 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -97,6 +97,10 @@
@@ -132,7 +132,7 @@ index afad085960b8..a94828fb31c2 100644
{
.procname = "tainted",
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index 87804e0371fe..66b5afb0d0ee 100644
+index e703d5d9cbe8..5758274feaee 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -21,6 +21,13 @@
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
deleted file mode 100644
index 963305f370a..00000000000
--- a/0002-Bluetooth-Fix-LL-PRivacy-BLE-device-fails-to-connect.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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
-
-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.
-HCI_ENABLE_LL_PRIVACY flag has to be tested before adding/deleting devices
-to resolving list. use_ll_privacy macro is used only to check if controller
-supports LL_Privacy.
-
-https://bugzilla.kernel.org/show_bug.cgi?id=209745
-
-Fixes: 0eee35bdfa3b ("Bluetooth: Update resolving list when updating whitelist")
-Signed-off-by: Sathish Narasimman <sathish.narasimman@intel.com>
-Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
----
- net/bluetooth/hci_request.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
-index e0269192f2e5..a565c91b8599 100644
---- a/net/bluetooth/hci_request.c
-+++ b/net/bluetooth/hci_request.c
-@@ -698,7 +698,8 @@ static void del_from_white_list(struct hci_request *req, bdaddr_t *bdaddr,
- cp.bdaddr_type);
- hci_req_add(req, HCI_OP_LE_DEL_FROM_WHITE_LIST, sizeof(cp), &cp);
-
-- if (use_ll_privacy(req->hdev)) {
-+ if (use_ll_privacy(req->hdev) &&
-+ hci_dev_test_flag(req->hdev, HCI_ENABLE_LL_PRIVACY)) {
- struct smp_irk *irk;
-
- irk = hci_find_irk_by_addr(req->hdev, bdaddr, bdaddr_type);
-@@ -732,7 +733,8 @@ static int add_to_white_list(struct hci_request *req,
- return -1;
-
- /* White list can not be used with RPAs */
-- if (!allow_rpa && !use_ll_privacy(hdev) &&
-+ if (!allow_rpa &&
-+ !hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY) &&
- hci_find_irk_by_addr(hdev, &params->addr, params->addr_type)) {
- return -1;
- }
-@@ -750,7 +752,8 @@ static int add_to_white_list(struct hci_request *req,
- cp.bdaddr_type);
- hci_req_add(req, HCI_OP_LE_ADD_TO_WHITE_LIST, sizeof(cp), &cp);
-
-- if (use_ll_privacy(hdev)) {
-+ if (use_ll_privacy(hdev) &&
-+ hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY)) {
- struct smp_irk *irk;
-
- irk = hci_find_irk_by_addr(hdev, &params->addr,
-@@ -812,7 +815,8 @@ static u8 update_white_list(struct hci_request *req)
- }
-
- /* White list can not be used with RPAs */
-- if (!allow_rpa && !use_ll_privacy(hdev) &&
-+ if (!allow_rpa &&
-+ !hci_dev_test_flag(hdev, HCI_ENABLE_LL_PRIVACY) &&
- hci_find_irk_by_addr(hdev, &b->bdaddr, b->bdaddr_type)) {
- return 0x00;
- }
---
-2.29.2
-
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 f108122ccb8..25fe50d48fe 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,7 +1,7 @@
-From 3d936926666bb681f2a9ed6e04f685667e61e2b4 Mon Sep 17 00:00:00 2001
+From 538fc2513b46f71985af6cb12344fee501ef58a5 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
+Subject: [PATCH 3/9] Bluetooth: Fix attempting to set RPA timeout when
unsupported
During controller initialization, an LE Set RPA Timeout command is sent
@@ -32,7 +32,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
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
+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)
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
index 8dad0a08d8a..454942cd536 100644
--- 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
@@ -1,7 +1,7 @@
-From b8c149d9a7cf8ec50440d0dcd90ff754ba72b616 Mon Sep 17 00:00:00 2001
+From 2dad55f373693e9e808fbdc836614162924990a2 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
+Subject: [PATCH 4/9] HID: quirks: Add Apple Magic Trackpad 2 to
hid_have_special_driver list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
diff --git a/0005-drm-amd-display-Add-get_dig_frontend-implementation-.patch b/0005-drm-amd-display-Add-get_dig_frontend-implementation-.patch
new file mode 100644
index 00000000000..4cb2e2b1d30
--- /dev/null
+++ b/0005-drm-amd-display-Add-get_dig_frontend-implementation-.patch
@@ -0,0 +1,112 @@
+From 39136f88e40628ff112fa5efd035e7707750d1a9 Mon Sep 17 00:00:00 2001
+From: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
+Date: Tue, 15 Dec 2020 10:33:34 -0500
+Subject: [PATCH 5/9] drm/amd/display: Add get_dig_frontend implementation for
+ DCEx
+
+Some old ASICs might not implement/require get_dig_frontend helper; in
+this scenario, we can have a NULL pointer exception when we try to call
+it inside vbios disable operation. For example, this situation might
+happen when using Polaris12 with an eDP panel. This commit avoids this
+situation by adding a specific get_dig_frontend implementation for DCEx.
+
+Cc: Alex Deucher <alexander.deucher@amd.com>
+Cc: Borislav Petkov <bp@alien8.de>
+Cc: Harry Wentland <Harry.Wentland@amd.com>
+Cc: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
+Cc: Chiawen Huang <chiawen.huang@amd.com>
+Reported-and-tested-by: Borislav Petkov <bp@suse.de>
+Acked-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+---
+ .../drm/amd/display/dc/dce/dce_link_encoder.c | 44 ++++++++++++++++++-
+ .../drm/amd/display/dc/dce/dce_link_encoder.h | 2 +
+ 2 files changed, 44 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
+index b409f6b2bfd8..56bc401536c5 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
+@@ -119,7 +119,8 @@ static const struct link_encoder_funcs dce110_lnk_enc_funcs = {
+ .disable_hpd = dce110_link_encoder_disable_hpd,
+ .is_dig_enabled = dce110_is_dig_enabled,
+ .destroy = dce110_link_encoder_destroy,
+- .get_max_link_cap = dce110_link_encoder_get_max_link_cap
++ .get_max_link_cap = dce110_link_encoder_get_max_link_cap,
++ .get_dig_frontend = dce110_get_dig_frontend
+ };
+
+ static enum bp_result link_transmitter_control(
+@@ -235,6 +236,44 @@ static void set_link_training_complete(
+
+ }
+
++unsigned int dce110_get_dig_frontend(struct link_encoder *enc)
++{
++ struct dce110_link_encoder *enc110 = TO_DCE110_LINK_ENC(enc);
++ u32 value;
++ enum engine_id result;
++
++ REG_GET(DIG_BE_CNTL, DIG_FE_SOURCE_SELECT, &value);
++
++ switch (value) {
++ case DCE110_DIG_FE_SOURCE_SELECT_DIGA:
++ result = ENGINE_ID_DIGA;
++ break;
++ case DCE110_DIG_FE_SOURCE_SELECT_DIGB:
++ result = ENGINE_ID_DIGB;
++ break;
++ case DCE110_DIG_FE_SOURCE_SELECT_DIGC:
++ result = ENGINE_ID_DIGC;
++ break;
++ case DCE110_DIG_FE_SOURCE_SELECT_DIGD:
++ result = ENGINE_ID_DIGD;
++ break;
++ case DCE110_DIG_FE_SOURCE_SELECT_DIGE:
++ result = ENGINE_ID_DIGE;
++ break;
++ case DCE110_DIG_FE_SOURCE_SELECT_DIGF:
++ result = ENGINE_ID_DIGF;
++ break;
++ case DCE110_DIG_FE_SOURCE_SELECT_DIGG:
++ result = ENGINE_ID_DIGG;
++ break;
++ default:
++ // invalid source select DIG
++ result = ENGINE_ID_UNKNOWN;
++ }
++
++ return result;
++}
++
+ void dce110_link_encoder_set_dp_phy_pattern_training_pattern(
+ struct link_encoder *enc,
+ uint32_t index)
+@@ -1665,7 +1704,8 @@ static const struct link_encoder_funcs dce60_lnk_enc_funcs = {
+ .disable_hpd = dce110_link_encoder_disable_hpd,
+ .is_dig_enabled = dce110_is_dig_enabled,
+ .destroy = dce110_link_encoder_destroy,
+- .get_max_link_cap = dce110_link_encoder_get_max_link_cap
++ .get_max_link_cap = dce110_link_encoder_get_max_link_cap,
++ .get_dig_frontend = dce110_get_dig_frontend
+ };
+
+ void dce60_link_encoder_construct(
+diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
+index cb714a48b171..fc6ade824c23 100644
+--- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
++++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
+@@ -295,6 +295,8 @@ void dce110_link_encoder_connect_dig_be_to_fe(
+ enum engine_id engine,
+ bool connect);
+
++unsigned int dce110_get_dig_frontend(struct link_encoder *enc);
++
+ void dce110_link_encoder_set_dp_phy_pattern_training_pattern(
+ struct link_encoder *enc,
+ uint32_t index);
+--
+2.29.2
+
diff --git a/0007-btrfs-Fix-500-2000-performance-regression-w-5.10.patch b/0007-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
new file mode 100644
index 00000000000..8e572055082
--- /dev/null
+++ b/0007-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
@@ -0,0 +1,61 @@
+From 1540b4377ebb3f46eac499e7596c3ec5be75551b Mon Sep 17 00:00:00 2001
+From: Josef Bacik <josef@toxicpanda.com>
+Date: Wed, 23 Dec 2020 14:41:00 -0500
+Subject: [PATCH 7/9] btrfs: Fix 500-2000% performance regression w/ 5.10
+
+Josef's tentative fix from
+https://lore.kernel.org/linux-btrfs/0382080a1836a12c2d625f8a5bf899828eba204b.1608752315.git.josef@toxicpanda.com/
+
+With the conflict fix mentioned in the reply.
+
+For https://bugs.archlinux.org/task/69077
+---
+ fs/btrfs/space-info.c | 25 ++++++++++++++++++++++++-
+ 1 file changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
+index 64099565ab8f..8a1ce11b6ed8 100644
+--- a/fs/btrfs/space-info.c
++++ b/fs/btrfs/space-info.c
+@@ -480,6 +480,28 @@ static inline u64 calc_reclaim_items_nr(struct btrfs_fs_info *fs_info,
+
+ #define EXTENT_SIZE_PER_ITEM SZ_256K
+
++static void btrfs_writeback_inodes_sb_nr(struct btrfs_fs_info *fs_info,
++ unsigned long nr_pages, u64 nr_items)
++{
++ struct super_block *sb = fs_info->sb;
++
++ if (down_read_trylock(&sb->s_umount)) {
++ writeback_inodes_sb_nr(sb, nr_pages, WB_REASON_FS_FREE_SPACE);
++ up_read(&sb->s_umount);
++ } else {
++ /*
++ * We needn't worry the filesystem going from r/w to r/o though
++ * we don't acquire ->s_umount mutex, because the filesystem
++ * should guarantee the delalloc inodes list be empty after
++ * the filesystem is readonly(all dirty pages are written to
++ * the disk).
++ */
++ btrfs_start_delalloc_roots(fs_info, nr_items);
++ if (!current->journal_info)
++ btrfs_wait_ordered_roots(fs_info, nr_items, 0, (u64)-1);
++ }
++}
++
+ /*
+ * shrink metadata reservation for delalloc
+ */
+@@ -532,7 +554,8 @@ static void shrink_delalloc(struct btrfs_fs_info *fs_info,
+
+ loops = 0;
+ while ((delalloc_bytes || dio_bytes) && loops < 3) {
+- btrfs_start_delalloc_roots(fs_info, items);
++ unsigned long nr_pages = min(delalloc_bytes, to_reclaim) >> PAGE_SHIFT;
++ btrfs_writeback_inodes_sb_nr(fs_info, nr_pages, items);
+
+ loops++;
+ if (wait_ordered && !trans) {
+--
+2.29.2
+
diff --git a/0008-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch b/0008-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
new file mode 100644
index 00000000000..04b0f7e6b79
--- /dev/null
+++ b/0008-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
@@ -0,0 +1,34 @@
+From 2059ba0b121bb366467fcefb35cef22cc23e2fe9 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Mon, 21 Dec 2020 20:14:02 +0100
+Subject: [PATCH 8/9] iwlwifi: Fix regression from UDP segmentation support
+
+Eric's tentative fix from
+https://lore.kernel.org/linux-wireless/CANn89iJWG2n1s3j7EdpwkQQv-9dOY02V+FGYHAWguO4JiqWuJA@mail.gmail.com/
+---
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+index fe1c538cd718..c27743a58f81 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+@@ -833,6 +833,7 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes,
+
+ next = skb_gso_segment(skb, netdev_flags);
+ skb_shinfo(skb)->gso_size = mss;
++ skb_shinfo(skb)->gso_type = ipv4 ? SKB_GSO_TCPV4 : SKB_GSO_TCPV6;
+ if (WARN_ON_ONCE(IS_ERR(next)))
+ return -EINVAL;
+ else if (next)
+@@ -855,6 +856,7 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int num_subframes,
+
+ if (tcp_payload_len > mss) {
+ skb_shinfo(tmp)->gso_size = mss;
++ skb_shinfo(tmp)->gso_type = ipv4 ? SKB_GSO_TCPV4 : SKB_GSO_TCPV6;
+ } else {
+ if (qos) {
+ u8 *qc;
+--
+2.29.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 195e60c3f42..cdd59bf06ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _srcname=linux-5.10
_major=5.10
### on initial release this is null otherwise it is the current stable subversion
### ie 1,2,3 corresponding $_major.1, $_major.3 etc
-_minor=2
+_minor=3
_minorc=$((_minor+1))
### on initial release this is just $_major
_fullver=$_major.$_minor
@@ -29,23 +29,27 @@ source=(
https://www.kernel.org/pub/linux/kernel/v5.x/linux-$_fullver.tar.{xz,sign}
config # the main kernel config file
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
+0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
+0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
+0005-drm-amd-display-Add-get_dig_frontend-implementation-.patch
+0007-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
+0008-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-b2sums=('c244d971c59b248a843070d19274964d817ebf0b111eb8abe20f90711962f5e11d3e591523bf3093a2e16e810dfaf8692b14ee251dc57d417842f358cdf70455'
+b2sums=('21cb6a79b621e502fb6c3bd1474aede7574928ba18ccde119c49849960bf5eb50099b483c582e7e202369b6ee6c13c1e6250a5cf6afeebfc717909b4db12d68c'
'SKIP'
- '708b51b58f63d8954073d7ab559286fc854c700108505e659474e55b2d0968cea002b8356d5441e6b24d37a4194684a6244293c760da6d442a6c76e268619a18'
+ '0a8603991e9de4b50c2a0c9b7f96d2d169a41567f81bfc8bfd3d41edd45a948d2a672236c9651d701f16f0cb619c39996c9cc883647bacb2cefb33100e072d98'
'SKIP'
'ac86054c7dc7e47cdc256c652c47cc4dc2100d1110637253fcc986fb5bcbda0023e8525d36253b9111284fd4d68c2a111219d904ac0489fdc251b26fb92d7c86'
- '4212b9f8d634038353c78fa4e33b7525789ea29fbb72bdeb4e263e1ae0c61b9ee22d6829b664b26fe2c7dff28a9d1f1fb2e558b9f90b32f78d8b2680816665ea'
- '2456d8a70e3c6f992ae5956efc3d0bee35480b55cf47088b5b31722059a213409fd0e4ba601e2b00ad25202fa44b336cf402e7d2def3ffe2861874a643f7d29a'
- '66cd32b08aee217d1031461161f1730c9c05c1585df9c1bdde857adf08477b4517d89766e90500704f28fb251101441efe22242f5290a7d2bc6095820e397adf'
- 'd07187d63303cd07a567aa5a7afdd908905c07e6f6f5c4154b1c2900c2020465970aeaa40ba36537b98014c7b111e32c440123eeb71a9a64160e5affa8660b9d')
+ '93567344c75bdd53b08bbae74d9cd6a99223825e37b59a762f7abd83ecf76e90d3a6d62d807d5ffe282aabbad21ae8c0e542fcf45e4419229de804068414d01d'
+ '155b189c79c1631d1f709ad7b01fc0b1d94e9c7a31ba0eacaa2dcde80020e8b7b36bea2429668fcac440c97a11ea26051cf2912f3f7af070a3878c8d00d53c82'
+ 'af8f9ad7ee3f78da380ca97be64179a5cf95216b0f3652a95536f313ac8a7fdb39657ec88ca70474582c56974d096691544afef5c31293194ef004710bcfbefa'
+ 'da02f8893032c5658d2ba900355c3a576214e39c369faac6599fbbd2c416fee6f4efa7683f069b0269993a1f395cf373f27e2fc001206b95c7870a8f594c8ce5'
+ '7733157d74983a5c2de0ab2aa1b41244ffa60e1fe038795fba1868a2410d2a91e23977462233628de85f3fea16921c48964f4c29e0a0af73e46cbd0dda26e05c'
+ '9550885b97c06a796ff62923f2049cc7c6b6db3a31a1824e7b1bf6d1417e7243c8dff5bb358495c562880a821769c43f4aff258cf3e4e93f0642ac1881282496')
export KBUILD_BUILD_HOST=archlinux