From: Greg Kroah-Hartman Date: Mon, 29 Mar 2021 07:16:50 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v5.11.11~13 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=306a6f94c2966c3fe88ec9012ad9bb2e4c434b5c;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: can-peak_usb-revert-can-peak_usb-add-forgotten-supported-devices.patch --- diff --git a/queue-4.14/can-peak_usb-revert-can-peak_usb-add-forgotten-supported-devices.patch b/queue-4.14/can-peak_usb-revert-can-peak_usb-add-forgotten-supported-devices.patch new file mode 100644 index 00000000000..002d1b3315a --- /dev/null +++ b/queue-4.14/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 +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 + +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 +Cc: Stephane Grosjean +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -26,8 +26,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-4.14/series b/queue-4.14/series index 34159b8d535..c076f469687 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -56,3 +56,4 @@ net-sched-validate-stab-values.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