5.4-stable patches

added patches:
	can-peak_usb-revert-can-peak_usb-add-forgotten-supported-devices.patch

diff --git a/queue-5.4/can-peak_usb-revert-can-peak_usb-add-forgotten-supported-devices.patch b/queue-5.4/can-peak_usb-revert-can-peak_usb-add-forgotten-supported-devices.patch
new file mode 100644 (file)
index 0000000..e245b9a
--- /dev/null
+++ b/queue-5.4/can-peak_usb-revert-can-peak_usb-add-forgotten-supported-devices.patch
@@ -0,0 +1,37 @@
+From 5d7047ed6b7214fbabc16d8712a822e256b1aa44 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sat, 20 Mar 2021 20:21:54 +0100
+Subject: can: peak_usb: Revert "can: peak_usb: add forgotten supported devices"
+
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+
+commit 5d7047ed6b7214fbabc16d8712a822e256b1aa44 upstream.
+
+In commit 6417f03132a6 ("module: remove never implemented
+MODULE_SUPPORTED_DEVICE") the MODULE_SUPPORTED_DEVICE macro was
+removed from the kerne entirely. Shortly before this patch was applied
+mainline the commit 59ec7b89ed3e ("can: peak_usb: add forgotten
+supported devices") was added to net/master. As this would result in a
+merge conflict, let's revert this patch.
+
+Fixes: 59ec7b89ed3e ("can: peak_usb: add forgotten supported devices")
+Link: https://lore.kernel.org/r/20210320192649.341832-1-mkl@pengutronix.de
+Suggested-by: Leon Romanovsky <leon@kernel.org>
+Cc: Stephane Grosjean <s.grosjean@peak-system.com>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/can/usb/peak_usb/pcan_usb_fd.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
++++ b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
+@@ -18,8 +18,6 @@
+ 
+ MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB FD adapter");
+ MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB Pro FD adapter");
+-MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-Chip USB");
+-MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB X6 adapter");
+ 
+ #define PCAN_USBPROFD_CHANNEL_COUNT   2
+ #define PCAN_USBFD_CHANNEL_COUNT      1

diff --git a/queue-5.4/series b/queue-5.4/series
index 46c7e75808270603092ad893fb51cbfb4e1bc0c5..b95f69b7423c98b4957707b168aee4158b43f8bb 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -108,3 +108,4 @@ net-dsa-b53-vlan-filtering-is-global-to-all-users.patch
 net-qrtr-fix-a-kernel-infoleak-in-qrtr_recvmsg.patch
 mac80211-fix-double-free-in-ibss_leave.patch
 ext4-add-reclaim-checks-to-xattr-code.patch
+can-peak_usb-revert-can-peak_usb-add-forgotten-supported-devices.patch