From: Greg Kroah-Hartman Date: Sat, 3 Apr 2021 08:33:23 +0000 (+0200) Subject: drop can-dev-move-driver-related-infrastructure-into-sepa.patch from 4.19 and 4.14 X-Git-Tag: v4.4.265~56 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b29d2c9fa4c85545b9fe1f3729a083039e04be8;p=thirdparty%2Fkernel%2Fstable-queue.git drop can-dev-move-driver-related-infrastructure-into-sepa.patch from 4.19 and 4.14 --- diff --git a/queue-4.14/can-dev-move-driver-related-infrastructure-into-sepa.patch b/queue-4.14/can-dev-move-driver-related-infrastructure-into-sepa.patch deleted file mode 100644 index 5267d472875..00000000000 --- a/queue-4.14/can-dev-move-driver-related-infrastructure-into-sepa.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 47cf5df5fadf232921faf83b2831f4dc93722edf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 11 Jan 2021 15:19:17 +0100 -Subject: can: dev: move driver related infrastructure into separate subdir - -From: Marc Kleine-Budde - -[ Upstream commit 3e77f70e734584e0ad1038e459ed3fd2400f873a ] - -This patch moves the CAN driver related infrastructure into a separate subdir. -It will be split into more files in the coming patches. - -Reviewed-by: Vincent Mailhol -Link: https://lore.kernel.org/r/20210111141930.693847-3-mkl@pengutronix.de -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Sasha Levin ---- - drivers/net/can/Makefile | 7 +------ - drivers/net/can/dev/Makefile | 7 +++++++ - drivers/net/can/{ => dev}/dev.c | 0 - drivers/net/can/{ => dev}/rx-offload.c | 0 - 4 files changed, 8 insertions(+), 6 deletions(-) - create mode 100644 drivers/net/can/dev/Makefile - rename drivers/net/can/{ => dev}/dev.c (100%) - rename drivers/net/can/{ => dev}/rx-offload.c (100%) - -diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile -index 02b8ed794564..fc1d8bd73fab 100644 ---- a/drivers/net/can/Makefile -+++ b/drivers/net/can/Makefile -@@ -7,12 +7,7 @@ obj-$(CONFIG_CAN_VCAN) += vcan.o - obj-$(CONFIG_CAN_VXCAN) += vxcan.o - obj-$(CONFIG_CAN_SLCAN) += slcan.o - --obj-$(CONFIG_CAN_DEV) += can-dev.o --can-dev-y += dev.o --can-dev-y += rx-offload.o -- --can-dev-$(CONFIG_CAN_LEDS) += led.o -- -+obj-y += dev/ - obj-y += rcar/ - obj-y += spi/ - obj-y += usb/ -diff --git a/drivers/net/can/dev/Makefile b/drivers/net/can/dev/Makefile -new file mode 100644 -index 000000000000..cba92e6bcf6f ---- /dev/null -+++ b/drivers/net/can/dev/Makefile -@@ -0,0 +1,7 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ -+obj-$(CONFIG_CAN_DEV) += can-dev.o -+can-dev-y += dev.o -+can-dev-y += rx-offload.o -+ -+can-dev-$(CONFIG_CAN_LEDS) += led.o -diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev/dev.c -similarity index 100% -rename from drivers/net/can/dev.c -rename to drivers/net/can/dev/dev.c -diff --git a/drivers/net/can/rx-offload.c b/drivers/net/can/dev/rx-offload.c -similarity index 100% -rename from drivers/net/can/rx-offload.c -rename to drivers/net/can/dev/rx-offload.c --- -2.30.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 5d347ee675a..5a036fec6e9 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -16,7 +16,6 @@ staging-comedi-cb_pcidas-fix-request_irq-warn.patch staging-comedi-cb_pcidas64-fix-request_irq-warn.patch asoc-rt5659-update-mclk-rate-in-set_sysclk.patch ext4-do-not-iput-inode-under-running-transaction-in-.patch -can-dev-move-driver-related-infrastructure-into-sepa.patch brcmfmac-clear-eap-association-status-bits-on-linkdo.patch net-ethernet-aquantia-handle-error-cleanup-of-start-.patch appletalk-fix-skb-allocation-size-in-loopback-case.patch diff --git a/queue-4.19/can-dev-move-driver-related-infrastructure-into-sepa.patch b/queue-4.19/can-dev-move-driver-related-infrastructure-into-sepa.patch deleted file mode 100644 index bc7e7532732..00000000000 --- a/queue-4.19/can-dev-move-driver-related-infrastructure-into-sepa.patch +++ /dev/null @@ -1,68 +0,0 @@ -From f6500478e491599bfb25c3b5e30bbaf6aa676c85 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 11 Jan 2021 15:19:17 +0100 -Subject: can: dev: move driver related infrastructure into separate subdir - -From: Marc Kleine-Budde - -[ Upstream commit 3e77f70e734584e0ad1038e459ed3fd2400f873a ] - -This patch moves the CAN driver related infrastructure into a separate subdir. -It will be split into more files in the coming patches. - -Reviewed-by: Vincent Mailhol -Link: https://lore.kernel.org/r/20210111141930.693847-3-mkl@pengutronix.de -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Sasha Levin ---- - drivers/net/can/Makefile | 7 +------ - drivers/net/can/dev/Makefile | 7 +++++++ - drivers/net/can/{ => dev}/dev.c | 0 - drivers/net/can/{ => dev}/rx-offload.c | 0 - 4 files changed, 8 insertions(+), 6 deletions(-) - create mode 100644 drivers/net/can/dev/Makefile - rename drivers/net/can/{ => dev}/dev.c (100%) - rename drivers/net/can/{ => dev}/rx-offload.c (100%) - -diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile -index 44922bf29b6a..93e11f1fee5c 100644 ---- a/drivers/net/can/Makefile -+++ b/drivers/net/can/Makefile -@@ -7,12 +7,7 @@ obj-$(CONFIG_CAN_VCAN) += vcan.o - obj-$(CONFIG_CAN_VXCAN) += vxcan.o - obj-$(CONFIG_CAN_SLCAN) += slcan.o - --obj-$(CONFIG_CAN_DEV) += can-dev.o --can-dev-y += dev.o --can-dev-y += rx-offload.o -- --can-dev-$(CONFIG_CAN_LEDS) += led.o -- -+obj-y += dev/ - obj-y += rcar/ - obj-y += spi/ - obj-y += usb/ -diff --git a/drivers/net/can/dev/Makefile b/drivers/net/can/dev/Makefile -new file mode 100644 -index 000000000000..cba92e6bcf6f ---- /dev/null -+++ b/drivers/net/can/dev/Makefile -@@ -0,0 +1,7 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ -+obj-$(CONFIG_CAN_DEV) += can-dev.o -+can-dev-y += dev.o -+can-dev-y += rx-offload.o -+ -+can-dev-$(CONFIG_CAN_LEDS) += led.o -diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev/dev.c -similarity index 100% -rename from drivers/net/can/dev.c -rename to drivers/net/can/dev/dev.c -diff --git a/drivers/net/can/rx-offload.c b/drivers/net/can/dev/rx-offload.c -similarity index 100% -rename from drivers/net/can/rx-offload.c -rename to drivers/net/can/dev/rx-offload.c --- -2.30.1 - diff --git a/queue-4.19/series b/queue-4.19/series index a5d454d1d94..d8ad43576a8 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -20,7 +20,6 @@ asoc-rt5659-update-mclk-rate-in-set_sysclk.patch thermal-core-add-null-pointer-check-before-using-coo.patch locking-ww_mutex-simplify-use_ww_ctx-ww_ctx-handling.patch ext4-do-not-iput-inode-under-running-transaction-in-.patch -can-dev-move-driver-related-infrastructure-into-sepa.patch brcmfmac-clear-eap-association-status-bits-on-linkdo.patch ath10k-hold-rcu-lock-when-calling-ieee80211_find_sta.patch net-ethernet-aquantia-handle-error-cleanup-of-start-.patch