This is a note to let you know that I've just added the patch titled can: peak_usb: Revert "can: peak_usb: add forgotten supported devices" to the 5.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: can-peak_usb-revert-can-peak_usb-add-forgotten-supported-devices.patch and it can be found in the queue-5.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 5d7047ed6b7214fbabc16d8712a822e256b1aa44 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxx Suggested-by: Leon Romanovsky <leon@xxxxxxxxxx> Cc: Stephane Grosjean <s.grosjean@xxxxxxxxxxxxxxx> Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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 Patches currently in stable-queue which might be from mkl@xxxxxxxxxxxxxx are queue-5.11/can-kvaser_pciefd-always-disable-bus-load-reporting.patch queue-5.11/can-m_can-m_can_rx_peripheral-fix-rx-being-blocked-b.patch queue-5.11/can-peak_usb-revert-can-peak_usb-add-forgotten-supported-devices.patch queue-5.11/can-m_can-m_can_do_rx_poll-fix-extraneous-msg-loss-w.patch queue-5.11/can-flexcan-flexcan_chip_freeze-fix-chip-freeze-for-.patch queue-5.11/can-c_can_pci-c_can_pci_remove-fix-use-after-free.patch queue-5.11/can-isotp-tx-path-zero-initialize-outgoing-can-frame.patch queue-5.11/can-isotp-tx-path-ensure-that-can-frame-flags-are-in.patch queue-5.11/can-isotp-isotp_setsockopt-only-allow-to-set-low-lev.patch queue-5.11/can-c_can-move-runtime-pm-enable-disable-to-c_can_pl.patch queue-5.11/can-dev-move-device-back-to-init-netns-on-owning-netns-delete.patch queue-5.11/can-peak_usb-add-forgotten-supported-devices.patch