From: Greg Kroah-Hartman Date: Mon, 29 Mar 2021 07:18:05 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.11.11~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1b10971ee662552c18770acf9e4ac41437f77f5;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: can-peak_usb-revert-can-peak_usb-add-forgotten-supported-devices.patch nvme-fix-the-nsid-value-to-print-in-nvme_validate_or_alloc_ns.patch --- diff --git a/queue-5.10/can-peak_usb-revert-can-peak_usb-add-forgotten-supported-devices.patch b/queue-5.10/can-peak_usb-revert-can-peak_usb-add-forgotten-supported-devices.patch new file mode 100644 index 00000000000..e245b9a79a5 --- /dev/null +++ b/queue-5.10/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 +@@ -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.10/nvme-fix-the-nsid-value-to-print-in-nvme_validate_or_alloc_ns.patch b/queue-5.10/nvme-fix-the-nsid-value-to-print-in-nvme_validate_or_alloc_ns.patch new file mode 100644 index 00000000000..08e3389e68e --- /dev/null +++ b/queue-5.10/nvme-fix-the-nsid-value-to-print-in-nvme_validate_or_alloc_ns.patch @@ -0,0 +1,31 @@ +From f4f9fc29e56b6fa9d7fa65ec51d3c82aff99c99b Mon Sep 17 00:00:00 2001 +From: Christoph Hellwig +Date: Fri, 12 Mar 2021 20:55:36 +0100 +Subject: nvme: fix the nsid value to print in nvme_validate_or_alloc_ns + +From: Christoph Hellwig + +commit f4f9fc29e56b6fa9d7fa65ec51d3c82aff99c99b upstream. + +ns can be NULL at this point, and my move of the check from +the original patch by Chaitanya broke this. + +Fixes: 0ec84df4953b ("nvme-core: check ctrl css before setting up zns") +Signed-off-by: Christoph Hellwig +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + drivers/nvme/host/core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/nvme/host/core.c ++++ b/drivers/nvme/host/core.c +@@ -4022,7 +4022,7 @@ static void nvme_validate_or_alloc_ns(st + if (!nvme_multi_css(ctrl)) { + dev_warn(ctrl->device, + "command set not reported for nsid: %d\n", +- ns->head->ns_id); ++ nsid); + break; + } + nvme_alloc_ns(ctrl, nsid, &ids); diff --git a/queue-5.10/series b/queue-5.10/series index a72a9a5684e..4cbfaf971d2 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -217,3 +217,5 @@ ext4-add-reclaim-checks-to-xattr-code.patch fs-ext4-fix-integer-overflow-in-s_log_groups_per_flex.patch revert-xen-fix-p2m-size-in-dom0-for-disabled-memory-hotplug-case.patch revert-net-bonding-fix-error-return-code-of-bond_neigh_init.patch +nvme-fix-the-nsid-value-to-print-in-nvme_validate_or_alloc_ns.patch +can-peak_usb-revert-can-peak_usb-add-forgotten-supported-devices.patch