From 7d2f1c818d9127916bd2010eb2c5f2cff2c84588 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 4 Dec 2023 14:56:32 -0500 Subject: [PATCH] Drop smb3-fix-touch-h-of-symlink.patch-27885 Signed-off-by: Sasha Levin --- queue-5.15/series | 1 - .../smb3-fix-touch-h-of-symlink.patch-27885 | 40 ------------------- 2 files changed, 41 deletions(-) delete mode 100644 queue-5.15/smb3-fix-touch-h-of-symlink.patch-27885 diff --git a/queue-5.15/series b/queue-5.15/series index de169feb12e..0d3d4f04c4d 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -61,7 +61,6 @@ cpufreq-imx6q-don-t-warn-for-disabling-a-non-existin.patch cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch iommu-vt-d-omit-devtlb-invalidation-requests-when-te.patch iommu-vt-d-make-context-clearing-consistent-with-con.patch -smb3-fix-touch-h-of-symlink.patch-27885 mmc-core-add-helpers-mmc_regulator_enable-disable_vq.patch mmc-sdhci-sprd-fix-vqmmc-not-shutting-down-after-the.patch r8169-disable-aspm-in-case-of-tx-timeout.patch diff --git a/queue-5.15/smb3-fix-touch-h-of-symlink.patch-27885 b/queue-5.15/smb3-fix-touch-h-of-symlink.patch-27885 deleted file mode 100644 index 670bdd82d80..00000000000 --- a/queue-5.15/smb3-fix-touch-h-of-symlink.patch-27885 +++ /dev/null @@ -1,40 +0,0 @@ -From 606596ae10df37697930a0e646cadc15eaa44ef7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 16 Oct 2023 12:18:23 -0500 -Subject: smb3: fix touch -h of symlink - -From: Steve French - -[ Upstream commit 475efd9808a3094944a56240b2711349e433fb66 ] - -For example: - touch -h -t 02011200 testfile -where testfile is a symlink would not change the timestamp, but - touch -t 02011200 testfile -does work to change the timestamp of the target - -Suggested-by: David Howells -Reported-by: Micah Veilleux -Closes: https://bugzilla.samba.org/show_bug.cgi?id=14476 -Cc: stable@vger.kernel.org -Signed-off-by: Steve French -Signed-off-by: Sasha Levin ---- - fs/cifs/cifsfs.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c -index b5ae209539ff1..af688e39f31ac 100644 ---- a/fs/cifs/cifsfs.c -+++ b/fs/cifs/cifsfs.c -@@ -1127,6 +1127,7 @@ const struct inode_operations cifs_file_inode_ops = { - - const struct inode_operations cifs_symlink_inode_ops = { - .get_link = cifs_get_link, -+ .setattr = cifs_setattr, - .permission = cifs_permission, - .listxattr = cifs_listxattr, - }; --- -2.42.0 - -- 2.47.3