Merging debian version 4.19.260-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 40 deletions

diff --git a/debian/patches-rt/0269-pci-switchtec-fix-stream_open.cocci-warnings.patch b/debian/patches-rt/0269-pci-switchtec-fix-stream_open.cocci-warnings.patch
deleted file mode 100644
index b754add55..000000000
--- a/debian/patches-rt/0269-pci-switchtec-fix-stream_open.cocci-warnings.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 088093ff4b48997a7b7ee99d8dcdfd02b47bf472 Mon Sep 17 00:00:00 2001
-From: kbuild test robot <lkp@intel.com>
-Date: Sat, 13 Apr 2019 11:22:51 +0800
-Subject: [PATCH 269/347] pci/switchtec: fix stream_open.cocci warnings
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.246-rt110.tar.xz
-
-[ Upstream commit 9462c69e29307adc95c289f50839d5d683973891 ]
-
-drivers/pci/switch/switchtec.c:395:1-17: ERROR: switchtec_fops: .read() can deadlock .write(); change nonseekable_open -> stream_open to fix.
-
-Generated by: scripts/coccinelle/api/stream_open.cocci
-
-Cc: Kirill Smelkov <kirr@nexedi.com>
-Cc: Julia Lawall <julia.lawall@lip6.fr>
-Fixes: 8a29a3bae2a2 ("pci/switchtec: Don't use completion's wait queue")
-Cc: stable-rt@vger.kernel.org # where it applies to
-Link: https://lkml.kernel.org/r/alpine.DEB.2.21.1904131849350.2536@hadrien
-Signed-off-by: kbuild test robot <lkp@intel.com>
-Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
----
- drivers/pci/switch/switchtec.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c
-index a8df847bedee..25d1f96cddc1 100644
---- a/drivers/pci/switch/switchtec.c
-+++ b/drivers/pci/switch/switchtec.c
-@@ -356,7 +356,7 @@ static int switchtec_dev_open(struct inode *inode, struct file *filp)
- 		return PTR_ERR(stuser);
- 
- 	filp->private_data = stuser;
--	nonseekable_open(inode, filp);
-+	stream_open(inode, filp);
- 
- 	dev_dbg(&stdev->dev, "%s: %p\n", __func__, stuser);
- 
--- 
-2.36.1
-