diff options
-rw-r--r-- | .SRCINFO | 26 | ||||
-rw-r--r-- | 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | 8 | ||||
-rw-r--r-- | 0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch | 4 | ||||
-rw-r--r-- | 0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch | 4 | ||||
-rw-r--r-- | 0004-Bluetooth-fix-deadlock-for-RFCOMM-sk-state-change.patch | 4 | ||||
-rw-r--r-- | 0005-mt76-mt7921-add-support-for-PCIe-ID-0x0608-0x0616.patch | 29 | ||||
-rw-r--r-- | 0006-mt76-mt7921-reduce-log-severity-levels-for-informati.patch | 45 | ||||
-rw-r--r-- | 0007-Revert-NFSv4.1-query-for-fs_location-attr-on-a-new-f.patch | 236 | ||||
-rw-r--r-- | PKGBUILD | 27 |
9 files changed, 353 insertions, 30 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-ck - pkgver = 5.16.10 + pkgver = 5.16.11 pkgrel = 1 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 @@ -12,26 +12,32 @@ pkgbase = linux-ck makedepends = tar makedepends = xz options = !strip - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.10.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.10.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.11.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.11.tar.sign source = config source = more-uarches-20211114.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20211114.tar.gz - source = xanmod-patches-from-ck-6b08df20f31708099a7fbccf5448958b4836118f.tar.gz::https://github.com/xanmod/linux-patches/archive/6b08df20f31708099a7fbccf5448958b4836118f.tar.gz + source = xanmod-patches-from-ck-c8fd0bce08e6219df068e717c53aa08a7fbb496d.tar.gz::https://github.com/xanmod/linux-patches/archive/c8fd0bce08e6219df068e717c53aa08a7fbb496d.tar.gz source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch source = 0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch source = 0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch source = 0004-Bluetooth-fix-deadlock-for-RFCOMM-sk-state-change.patch + source = 0005-mt76-mt7921-add-support-for-PCIe-ID-0x0608-0x0616.patch + source = 0006-mt76-mt7921-reduce-log-severity-levels-for-informati.patch + source = 0007-Revert-NFSv4.1-query-for-fs_location-attr-on-a-new-f.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - b2sums = 6394d715c765e27aafa3ef7ba34fb17522eb14c5e004b8ab54eb31b55bcb782205d516cdef5f7204739890642289cd1f2ef8ac430a7ee63698ccf3b3d7b0b118 + b2sums = 165fc78193959c0876158b3448fe33361a9b30ead17f216b92f94a11aad7a6a0e38a852a69239d954ad71978c14b79f8aca19903ce9d540c9776c855308beb50 b2sums = SKIP b2sums = b837c6c0d9b5e39047ebddececa28f7fbe078b8c6d8d95028cb6bf5265f7b754415e3eed779d5bce075b1163f9b5fdd28b06f2552abf99061a436e3665aa0c8a b2sums = 534091fb5034226d48f18da2114305860e67ee49a1d726b049a240ce61df83e840a9a255e5b8fa9279ec07dd69fb0aea6e2e48962792c2b5367db577a4423d8d - b2sums = 7e12da62ddc8535b044f57447e15b550dc2d1421bba4fc830dfad7b328b01f21190f63c5534b9af6a8c09f56bfb9c21014b07645569a6c7b93b950aca07ade5a - b2sums = 3a5138cc28ad21dd1dbe867bc90f89bc85fc4f8a778af431be04eb392e3b8b0dc2b42936a2b6e3cfc37735f5c0843e0cea7be4749dec26a2a24d6b79ef834cd4 - b2sums = 822af62f3b8708e53579e523086594211fcf35309527451bf89bb2ef886c0ff410f88b1c568cf6dd3f6079f68e4009ce3474c8de77ecb8bb888eb58c9879589a - b2sums = 7d7b38b9c4e63c3465f1e7eb65199a9e57f93ae8c55132716960a9b2391436698615027ba953c33024f8da08d7fd0bfbc1ca1799f8566a55a2422f6126a627c9 - b2sums = bca4fc5afe454e5dd8c1e8f667747a56bc5915b43b04c08753f4922087a92f545071c41d57218b52364c9030cfc077104715c7884c20e5db44a0939032d7957e + b2sums = 47843d5eae56b388742ef6d73372962a2f28c03d73501ddf30b62a194b81b781d0d5ce73131e30c70d09cdb27a2960bf952ed9e4767222c5bd44605047087ee7 + b2sums = fcbd8714ac56ee03e8c61615773fbc104db77a2ebe761b3e94449889733b0c61779c54f891998fe46c9fe6238517c82c39d9073f053760590396552a6ae28e98 + b2sums = b742a79eb3829e0798f01e0a4f76164a2a5ed53c1eeb751735e28ec60976a58c3383a48a17c8165aa7b0c38996f9c99ab34912b0f116d3e76efa6de43a11f330 + b2sums = 146afd039830cc2f8752f048e62df32ef9216c608b7cd98bccaac963fcd167d7215ef0f8f21de165fc6dc00b76f0e30bda03b9f83c2b94458634322765e0389d + b2sums = 47ad8f60760a65e0ef732035b981166376faec33284701c414600b42416a5c65f23bdee149874deb3472c1b3559f8b61ef5d0c3f5c4b965dc8c6fb6eb9f76b18 + b2sums = 0f84ab2d64281c45ad22ce7e148f526e37dc2c35a715ed8b29a311c07f29ce4a6b4a52cab019048f46f7b626a5716ed68a8a603dc723cc8158ffc77a5c940b86 + b2sums = 079582f81133b2bc24b2868700104ee747a4b1ad3da31180bcb37db9abd111d89b06801b81305c426d4ed7f7ec0e7341b0d30e312dc8f1e9b326c11ef6d6ff55 + b2sums = 95bb03860cc91cfe9ebfea7128eda2be281c97bec5f6fdaa90404b4043d87c8689053d44d49bf504eac5e128e5132dad33bf90d67474eceb6c2f7a205b65b5a5 pkgname = linux-ck pkgdesc = The Linux-ck kernel and modules with ck's hrtimer patches 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 20847e06fdd8..f4118375fb24 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 4fe1df69265cb1fb1a66428fbe8dfe40c60b662d Mon Sep 17 00:00:00 2001 +From e61eba6362dd37ff51674fb1b697a73308b8cded 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/8] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. @@ -63,7 +63,7 @@ index 4b7bac10c72d..40ea1367f14a 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index 3244cc56b697..ea4d51d3eda9 100644 +index 50d02e3103a5..27d39990babc 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -97,6 +97,10 @@ @@ -88,7 +88,7 @@ index 3244cc56b697..ea4d51d3eda9 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -3053,6 +3061,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -3052,6 +3060,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; diff --git a/0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch b/0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch index a7348588d402..73f49eb58f3a 100644 --- a/0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch +++ b/0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch @@ -1,7 +1,7 @@ -From 546258a743a1adcd7025ac26a7dead87c24ef9d5 Mon Sep 17 00:00:00 2001 +From 92162f217311b0660a92fa190e5c968e5721e0bf Mon Sep 17 00:00:00 2001 From: Kiran K <kiran.k@intel.com> Date: Wed, 13 Oct 2021 13:35:11 +0530 -Subject: [PATCH 2/5] Bluetooth: btintel: Fix bdaddress comparison with garbage +Subject: [PATCH 2/8] Bluetooth: btintel: Fix bdaddress comparison with garbage value Intel Read Verision(TLV) data is parsed into a local structure variable diff --git a/0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch b/0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch index b2a9e10efaba..ad0d7d48e00b 100644 --- a/0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch +++ b/0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch @@ -1,7 +1,7 @@ -From faddd54476a3492341e1f01b09940825bbabb30e Mon Sep 17 00:00:00 2001 +From 002d105f8a78b19624fc5e3eccbb77af8b1a3a77 Mon Sep 17 00:00:00 2001 From: Kiran K <kiran.k@intel.com> Date: Tue, 5 Oct 2021 20:15:56 +0530 -Subject: [PATCH 3/5] Bluetooth: Read codec capabilities only if supported +Subject: [PATCH 3/8] Bluetooth: Read codec capabilities only if supported Read codec capabilities only if HCI_READ_LOCAL_CODEC_CAPABILITIES command is supported. If capablities are not supported, then diff --git a/0004-Bluetooth-fix-deadlock-for-RFCOMM-sk-state-change.patch b/0004-Bluetooth-fix-deadlock-for-RFCOMM-sk-state-change.patch index 38ba742ec9c2..1ba779044aed 100644 --- a/0004-Bluetooth-fix-deadlock-for-RFCOMM-sk-state-change.patch +++ b/0004-Bluetooth-fix-deadlock-for-RFCOMM-sk-state-change.patch @@ -1,7 +1,7 @@ -From a3522be2facbca017e2ce12b7899bef3775e26c0 Mon Sep 17 00:00:00 2001 +From 57146857cb0f54f36038f7270ac4ab5d2f3f9ed8 Mon Sep 17 00:00:00 2001 From: Desmond Cheong Zhi Xi <desmondcheongzx@gmail.com> Date: Mon, 4 Oct 2021 14:07:34 -0400 -Subject: [PATCH 4/5] Bluetooth: fix deadlock for RFCOMM sk state change +Subject: [PATCH 4/8] Bluetooth: fix deadlock for RFCOMM sk state change Syzbot reports the following task hang [1]: diff --git a/0005-mt76-mt7921-add-support-for-PCIe-ID-0x0608-0x0616.patch b/0005-mt76-mt7921-add-support-for-PCIe-ID-0x0608-0x0616.patch new file mode 100644 index 000000000000..25619fe630a1 --- /dev/null +++ b/0005-mt76-mt7921-add-support-for-PCIe-ID-0x0608-0x0616.patch @@ -0,0 +1,29 @@ +From 5c3de90cea9024359e4c78d2dc52b4b8043e9ee3 Mon Sep 17 00:00:00 2001 +From: Deren Wu <deren.wu@mediatek.com> +Date: Sun, 14 Nov 2021 10:46:57 +0800 +Subject: [PATCH 5/8] mt76: mt7921: add support for PCIe ID 0x0608/0x0616 + +New mt7921 serials chip support + +Signed-off-by: Deren Wu <deren.wu@mediatek.com> +Signed-off-by: Felix Fietkau <nbd@nbd.name> +--- + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c +index 40186e6cd865..1212b803b1c8 100644 +--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c ++++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c +@@ -15,6 +15,8 @@ + static const struct pci_device_id mt7921_pci_device_table[] = { + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7961) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7922) }, ++ { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x0608) }, ++ { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x0616) }, + { }, + }; + +-- +2.35.1 + diff --git a/0006-mt76-mt7921-reduce-log-severity-levels-for-informati.patch b/0006-mt76-mt7921-reduce-log-severity-levels-for-informati.patch new file mode 100644 index 000000000000..cf233916c223 --- /dev/null +++ b/0006-mt76-mt7921-reduce-log-severity-levels-for-informati.patch @@ -0,0 +1,45 @@ +From 3f214da518342648eee58bb01645d5e768f8120c Mon Sep 17 00:00:00 2001 +From: Tzung-Bi Shih <tzungbi@google.com> +Date: Fri, 10 Dec 2021 17:17:46 +0800 +Subject: [PATCH 6/8] mt76: mt7921: reduce log severity levels for informative + messages + +"ASIC revision" and "Firmware init done" shouldn't be error messages. +Reduces the severity levels. + +Signed-off-by: Tzung-Bi Shih <tzungbi@google.com> +Signed-off-by: Felix Fietkau <nbd@nbd.name> +--- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +index 4c6adbb96955..ea4edf187e0a 100644 +--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c ++++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +@@ -869,7 +869,7 @@ static int mt7921_load_firmware(struct mt7921_dev *dev) + dev->mt76.hw->wiphy->wowlan = &mt76_connac_wowlan_support; + #endif /* CONFIG_PM */ + +- dev_err(dev->mt76.dev, "Firmware init done\n"); ++ dev_dbg(dev->mt76.dev, "Firmware init done\n"); + + return 0; + } +diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c +index 1212b803b1c8..9dae2f5972bf 100644 +--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c ++++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c +@@ -190,7 +190,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, + tasklet_init(&dev->irq_tasklet, mt7921_irq_tasklet, (unsigned long)dev); + mdev->rev = (mt7921_l1_rr(dev, MT_HW_CHIPID) << 16) | + (mt7921_l1_rr(dev, MT_HW_REV) & 0xff); +- dev_err(mdev->dev, "ASIC revision: %04x\n", mdev->rev); ++ dev_info(mdev->dev, "ASIC revision: %04x\n", mdev->rev); + + mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0); + +-- +2.35.1 + diff --git a/0007-Revert-NFSv4.1-query-for-fs_location-attr-on-a-new-f.patch b/0007-Revert-NFSv4.1-query-for-fs_location-attr-on-a-new-f.patch new file mode 100644 index 000000000000..b3a96a9608d6 --- /dev/null +++ b/0007-Revert-NFSv4.1-query-for-fs_location-attr-on-a-new-f.patch @@ -0,0 +1,236 @@ +From 546ff90cf9e006e9b08d93159b4883ff877654ed Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> +Date: Thu, 24 Feb 2022 03:14:51 +0100 +Subject: [PATCH 7/8] Revert "NFSv4.1 query for fs_location attr on a new file + system" + +This reverts commit 55b35b43a16ebed88df3ffac11e17ad0909bdf19. + +For: https://bugs.archlinux.org/task/73838 +For: https://bugs.archlinux.org/task/73860 +--- + fs/nfs/client.c | 7 ---- + fs/nfs/nfs4_fs.h | 9 +++-- + fs/nfs/nfs4proc.c | 76 ++++++----------------------------------- + fs/nfs/nfs4state.c | 3 +- + include/linux/nfs_xdr.h | 1 - + 5 files changed, 15 insertions(+), 81 deletions(-) + +diff --git a/fs/nfs/client.c b/fs/nfs/client.c +index a1e87419f3a4..2d2f2c091c65 100644 +--- a/fs/nfs/client.c ++++ b/fs/nfs/client.c +@@ -860,13 +860,6 @@ static int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, str + server->namelen = pathinfo.max_namelen; + } + +- if (clp->rpc_ops->discover_trunking != NULL && +- (server->caps & NFS_CAP_FS_LOCATIONS)) { +- error = clp->rpc_ops->discover_trunking(server, mntfh); +- if (error < 0) +- return error; +- } +- + return 0; + } + +diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h +index 85c5d08dfa9c..2364661a6a08 100644 +--- a/fs/nfs/nfs4_fs.h ++++ b/fs/nfs/nfs4_fs.h +@@ -260,8 +260,8 @@ struct nfs4_state_maintenance_ops { + }; + + struct nfs4_mig_recovery_ops { +- int (*get_locations)(struct nfs_server *, struct nfs_fh *, +- struct nfs4_fs_locations *, struct page *, const struct cred *); ++ int (*get_locations)(struct inode *, struct nfs4_fs_locations *, ++ struct page *, const struct cred *); + int (*fsid_present)(struct inode *, const struct cred *); + }; + +@@ -303,9 +303,8 @@ extern int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait); + extern int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle); + extern int nfs4_proc_fs_locations(struct rpc_clnt *, struct inode *, const struct qstr *, + struct nfs4_fs_locations *, struct page *); +-extern int nfs4_proc_get_locations(struct nfs_server *, struct nfs_fh *, +- struct nfs4_fs_locations *, +- struct page *page, const struct cred *); ++extern int nfs4_proc_get_locations(struct inode *, struct nfs4_fs_locations *, ++ struct page *page, const struct cred *); + extern int nfs4_proc_fsid_present(struct inode *, const struct cred *); + extern struct rpc_clnt *nfs4_proc_lookup_mountpoint(struct inode *, + struct dentry *, +diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c +index 0abbbf5d2bdf..ba3aa4575d25 100644 +--- a/fs/nfs/nfs4proc.c ++++ b/fs/nfs/nfs4proc.c +@@ -3933,60 +3933,6 @@ int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle) + return err; + } + +-static int _nfs4_discover_trunking(struct nfs_server *server, +- struct nfs_fh *fhandle) +-{ +- struct nfs4_fs_locations *locations = NULL; +- struct page *page; +- const struct cred *cred; +- struct nfs_client *clp = server->nfs_client; +- const struct nfs4_state_maintenance_ops *ops = +- clp->cl_mvops->state_renewal_ops; +- int status = -ENOMEM; +- +- cred = ops->get_state_renewal_cred(clp); +- if (cred == NULL) { +- cred = nfs4_get_clid_cred(clp); +- if (cred == NULL) +- return -ENOKEY; +- } +- +- page = alloc_page(GFP_KERNEL); +- locations = kmalloc(sizeof(struct nfs4_fs_locations), GFP_KERNEL); +- if (page == NULL || locations == NULL) +- goto out; +- +- status = nfs4_proc_get_locations(server, fhandle, locations, page, +- cred); +- if (status) +- goto out; +-out: +- if (page) +- __free_page(page); +- kfree(locations); +- return status; +-} +- +-static int nfs4_discover_trunking(struct nfs_server *server, +- struct nfs_fh *fhandle) +-{ +- struct nfs4_exception exception = { +- .interruptible = true, +- }; +- struct nfs_client *clp = server->nfs_client; +- int err = 0; +- +- if (!nfs4_has_session(clp)) +- goto out; +- do { +- err = nfs4_handle_exception(server, +- _nfs4_discover_trunking(server, fhandle), +- &exception); +- } while (exception.retry); +-out: +- return err; +-} +- + static int _nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, + struct nfs_fsinfo *info) + { +@@ -7873,18 +7819,18 @@ int nfs4_proc_fs_locations(struct rpc_clnt *client, struct inode *dir, + * appended to this compound to identify the client ID which is + * performing recovery. + */ +-static int _nfs40_proc_get_locations(struct nfs_server *server, +- struct nfs_fh *fhandle, ++static int _nfs40_proc_get_locations(struct inode *inode, + struct nfs4_fs_locations *locations, + struct page *page, const struct cred *cred) + { ++ struct nfs_server *server = NFS_SERVER(inode); + struct rpc_clnt *clnt = server->client; + u32 bitmask[2] = { + [0] = FATTR4_WORD0_FSID | FATTR4_WORD0_FS_LOCATIONS, + }; + struct nfs4_fs_locations_arg args = { + .clientid = server->nfs_client->cl_clientid, +- .fh = fhandle, ++ .fh = NFS_FH(inode), + .page = page, + .bitmask = bitmask, + .migration = 1, /* skip LOOKUP */ +@@ -7930,17 +7876,17 @@ static int _nfs40_proc_get_locations(struct nfs_server *server, + * When the client supports GETATTR(fs_locations_info), it can + * be plumbed in here. + */ +-static int _nfs41_proc_get_locations(struct nfs_server *server, +- struct nfs_fh *fhandle, ++static int _nfs41_proc_get_locations(struct inode *inode, + struct nfs4_fs_locations *locations, + struct page *page, const struct cred *cred) + { ++ struct nfs_server *server = NFS_SERVER(inode); + struct rpc_clnt *clnt = server->client; + u32 bitmask[2] = { + [0] = FATTR4_WORD0_FSID | FATTR4_WORD0_FS_LOCATIONS, + }; + struct nfs4_fs_locations_arg args = { +- .fh = fhandle, ++ .fh = NFS_FH(inode), + .page = page, + .bitmask = bitmask, + .migration = 1, /* skip LOOKUP */ +@@ -7989,11 +7935,11 @@ static int _nfs41_proc_get_locations(struct nfs_server *server, + * -NFS4ERR_LEASE_MOVED is returned if the server still has leases + * from this client that require migration recovery. + */ +-int nfs4_proc_get_locations(struct nfs_server *server, +- struct nfs_fh *fhandle, ++int nfs4_proc_get_locations(struct inode *inode, + struct nfs4_fs_locations *locations, + struct page *page, const struct cred *cred) + { ++ struct nfs_server *server = NFS_SERVER(inode); + struct nfs_client *clp = server->nfs_client; + const struct nfs4_mig_recovery_ops *ops = + clp->cl_mvops->mig_recovery_ops; +@@ -8006,11 +7952,10 @@ int nfs4_proc_get_locations(struct nfs_server *server, + (unsigned long long)server->fsid.major, + (unsigned long long)server->fsid.minor, + clp->cl_hostname); +- nfs_display_fhandle(fhandle, __func__); ++ nfs_display_fhandle(NFS_FH(inode), __func__); + + do { +- status = ops->get_locations(server, fhandle, locations, page, +- cred); ++ status = ops->get_locations(inode, locations, page, cred); + if (status != -NFS4ERR_DELAY) + break; + nfs4_handle_exception(server, status, &exception); +@@ -10479,7 +10424,6 @@ const struct nfs_rpc_ops nfs_v4_clientops = { + .free_client = nfs4_free_client, + .create_server = nfs4_create_server, + .clone_server = nfs_clone_server, +- .discover_trunking = nfs4_discover_trunking, + }; + + static const struct xattr_handler nfs4_xattr_nfs4_acl_handler = { +diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c +index 499bef9fe118..f3265575c28d 100644 +--- a/fs/nfs/nfs4state.c ++++ b/fs/nfs/nfs4state.c +@@ -2098,8 +2098,7 @@ static int nfs4_try_migration(struct nfs_server *server, const struct cred *cred + } + + inode = d_inode(server->super->s_root); +- result = nfs4_proc_get_locations(server, NFS_FH(inode), locations, +- page, cred); ++ result = nfs4_proc_get_locations(inode, locations, page, cred); + if (result) { + dprintk("<-- %s: failed to retrieve fs_locations: %d\n", + __func__, result); +diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h +index 695fa84611b6..967a0098f0a9 100644 +--- a/include/linux/nfs_xdr.h ++++ b/include/linux/nfs_xdr.h +@@ -1795,7 +1795,6 @@ struct nfs_rpc_ops { + struct nfs_server *(*create_server)(struct fs_context *); + struct nfs_server *(*clone_server)(struct nfs_server *, struct nfs_fh *, + struct nfs_fattr *, rpc_authflavor_t); +- int (*discover_trunking)(struct nfs_server *, struct nfs_fh *); + }; + + /* +-- +2.35.1 + @@ -64,7 +64,7 @@ _subarch= ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-ck -pkgver=5.16.10 +pkgver=5.16.11 pkgrel=1 arch=(x86_64) url="https://wiki.archlinux.org/index.php/Linux-ck" @@ -76,8 +76,8 @@ options=('!strip') # https://ck-hack.blogspot.com/2021/08/514-and-future-of-muqss-and-ck-once.html # thankfully xanmod keeps the hrtimer patches up to date -_commit=6b08df20f31708099a7fbccf5448958b4836118f -_xan=linux-5.15.y-xanmod +_commit=c8fd0bce08e6219df068e717c53aa08a7fbb496d +_xan=linux-5.16.y-xanmod _gcc_more_v=20211114 source=( @@ -89,20 +89,26 @@ source=( 0002-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch 0003-Bluetooth-Read-codec-capabilities-only-if-supported.patch 0004-Bluetooth-fix-deadlock-for-RFCOMM-sk-state-change.patch + 0005-mt76-mt7921-add-support-for-PCIe-ID-0x0608-0x0616.patch + 0006-mt76-mt7921-reduce-log-severity-levels-for-informati.patch + 0007-Revert-NFSv4.1-query-for-fs_location-attr-on-a-new-f.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -b2sums=('6394d715c765e27aafa3ef7ba34fb17522eb14c5e004b8ab54eb31b55bcb782205d516cdef5f7204739890642289cd1f2ef8ac430a7ee63698ccf3b3d7b0b118' +b2sums=('165fc78193959c0876158b3448fe33361a9b30ead17f216b92f94a11aad7a6a0e38a852a69239d954ad71978c14b79f8aca19903ce9d540c9776c855308beb50' 'SKIP' 'b837c6c0d9b5e39047ebddececa28f7fbe078b8c6d8d95028cb6bf5265f7b754415e3eed779d5bce075b1163f9b5fdd28b06f2552abf99061a436e3665aa0c8a' '534091fb5034226d48f18da2114305860e67ee49a1d726b049a240ce61df83e840a9a255e5b8fa9279ec07dd69fb0aea6e2e48962792c2b5367db577a4423d8d' - '7e12da62ddc8535b044f57447e15b550dc2d1421bba4fc830dfad7b328b01f21190f63c5534b9af6a8c09f56bfb9c21014b07645569a6c7b93b950aca07ade5a' - '3a5138cc28ad21dd1dbe867bc90f89bc85fc4f8a778af431be04eb392e3b8b0dc2b42936a2b6e3cfc37735f5c0843e0cea7be4749dec26a2a24d6b79ef834cd4' - '822af62f3b8708e53579e523086594211fcf35309527451bf89bb2ef886c0ff410f88b1c568cf6dd3f6079f68e4009ce3474c8de77ecb8bb888eb58c9879589a' - '7d7b38b9c4e63c3465f1e7eb65199a9e57f93ae8c55132716960a9b2391436698615027ba953c33024f8da08d7fd0bfbc1ca1799f8566a55a2422f6126a627c9' - 'bca4fc5afe454e5dd8c1e8f667747a56bc5915b43b04c08753f4922087a92f545071c41d57218b52364c9030cfc077104715c7884c20e5db44a0939032d7957e') + '47843d5eae56b388742ef6d73372962a2f28c03d73501ddf30b62a194b81b781d0d5ce73131e30c70d09cdb27a2960bf952ed9e4767222c5bd44605047087ee7' + 'fcbd8714ac56ee03e8c61615773fbc104db77a2ebe761b3e94449889733b0c61779c54f891998fe46c9fe6238517c82c39d9073f053760590396552a6ae28e98' + 'b742a79eb3829e0798f01e0a4f76164a2a5ed53c1eeb751735e28ec60976a58c3383a48a17c8165aa7b0c38996f9c99ab34912b0f116d3e76efa6de43a11f330' + '146afd039830cc2f8752f048e62df32ef9216c608b7cd98bccaac963fcd167d7215ef0f8f21de165fc6dc00b76f0e30bda03b9f83c2b94458634322765e0389d' + '47ad8f60760a65e0ef732035b981166376faec33284701c414600b42416a5c65f23bdee149874deb3472c1b3559f8b61ef5d0c3f5c4b965dc8c6fb6eb9f76b18' + '0f84ab2d64281c45ad22ce7e148f526e37dc2c35a715ed8b29a311c07f29ce4a6b4a52cab019048f46f7b626a5716ed68a8a603dc723cc8158ffc77a5c940b86' + '079582f81133b2bc24b2868700104ee747a4b1ad3da31180bcb37db9abd111d89b06801b81305c426d4ed7f7ec0e7341b0d30e312dc8f1e9b326c11ef6d6ff55' + '95bb03860cc91cfe9ebfea7128eda2be281c97bec5f6fdaa90404b4043d87c8689053d44d49bf504eac5e128e5132dad33bf90d67474eceb6c2f7a205b65b5a5') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase @@ -156,7 +162,8 @@ prepare() { # these are ck's htrimer patches echo "Patching with ck hrtimer patches..." - for i in ../linux-patches-"$_commit"/"$_xan"/ck-hrtimer/0*.patch; do + #for i in ../linux-patches-"$_commit"/"$_xan"/ck-hrtimer/0*.patch; do + for i in ../linux-patches-"$_commit"/linux-5.15.y-xanmod/ck-hrtimer/0*.patch; do patch -Np1 -i $i done |