From: Greg Kroah-Hartman Date: Thu, 14 Apr 2022 15:49:55 +0000 (+0200) Subject: drop hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch X-Git-Tag: v4.19.238~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3eb81ff9696dd1bccd4857e8f203599ea904ba0c;p=thirdparty%2Fkernel%2Fstable-queue.git drop hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch --- diff --git a/queue-4.14/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch b/queue-4.14/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch deleted file mode 100644 index c068810e3f8..00000000000 --- a/queue-4.14/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1dc2f2b81a6a9895da59f3915760f6c0c3074492 Mon Sep 17 00:00:00 2001 -From: Randy Dunlap -Date: Thu, 25 Nov 2021 18:33:16 -0800 -Subject: hv: utils: add PTP_1588_CLOCK to Kconfig to fix build - -From: Randy Dunlap - -commit 1dc2f2b81a6a9895da59f3915760f6c0c3074492 upstream. - -The hyperv utilities use PTP clock interfaces and should depend a -a kconfig symbol such that they will be built as a loadable module or -builtin so that linker errors do not happen. - -Prevents these build errors: - -ld: drivers/hv/hv_util.o: in function `hv_timesync_deinit': -hv_util.c:(.text+0x37d): undefined reference to `ptp_clock_unregister' -ld: drivers/hv/hv_util.o: in function `hv_timesync_init': -hv_util.c:(.text+0x738): undefined reference to `ptp_clock_register' - -Fixes: 3716a49a81ba ("hv_utils: implement Hyper-V PTP source") -Signed-off-by: Randy Dunlap -Reported-by: kernel test robot -Cc: Arnd Bergmann -Cc: "K. Y. Srinivasan" -Cc: Haiyang Zhang -Cc: Stephen Hemminger -Cc: Wei Liu -Cc: Dexuan Cui -Cc: linux-hyperv@vger.kernel.org -Cc: Greg Kroah-Hartman -Reviewed-by: Michael Kelley -Link: https://lore.kernel.org/r/20211126023316.25184-1-rdunlap@infradead.org -Signed-off-by: Wei Liu -Cc: Petr Å tetiar -Signed-off-by: Greg Kroah-Hartman ---- - drivers/hv/Kconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/hv/Kconfig -+++ b/drivers/hv/Kconfig -@@ -14,6 +14,7 @@ config HYPERV_TSCPAGE - config HYPERV_UTILS - tristate "Microsoft Hyper-V Utilities driver" - depends on HYPERV && CONNECTOR && NLS -+ depends on PTP_1588_CLOCK_OPTIONAL - help - Select this option to enable the Hyper-V Utilities. - diff --git a/queue-4.14/series b/queue-4.14/series index 68b760ef51b..19d71c5c72f 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1,6 +1,5 @@ usb-serial-pl2303-add-ibm-device-ids.patch usb-serial-simple-add-nokia-phone-driver.patch -hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch netdevice-add-the-case-if-dev-is-null.patch virtio_console-break-out-of-buf-poll-on-remove.patch ethernet-sun-free-the-coherent-when-failing-in-probi.patch diff --git a/queue-4.19/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch b/queue-4.19/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch deleted file mode 100644 index ecbc5e6773d..00000000000 --- a/queue-4.19/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1dc2f2b81a6a9895da59f3915760f6c0c3074492 Mon Sep 17 00:00:00 2001 -From: Randy Dunlap -Date: Thu, 25 Nov 2021 18:33:16 -0800 -Subject: hv: utils: add PTP_1588_CLOCK to Kconfig to fix build - -From: Randy Dunlap - -commit 1dc2f2b81a6a9895da59f3915760f6c0c3074492 upstream. - -The hyperv utilities use PTP clock interfaces and should depend a -a kconfig symbol such that they will be built as a loadable module or -builtin so that linker errors do not happen. - -Prevents these build errors: - -ld: drivers/hv/hv_util.o: in function `hv_timesync_deinit': -hv_util.c:(.text+0x37d): undefined reference to `ptp_clock_unregister' -ld: drivers/hv/hv_util.o: in function `hv_timesync_init': -hv_util.c:(.text+0x738): undefined reference to `ptp_clock_register' - -Fixes: 3716a49a81ba ("hv_utils: implement Hyper-V PTP source") -Signed-off-by: Randy Dunlap -Reported-by: kernel test robot -Cc: Arnd Bergmann -Cc: "K. Y. Srinivasan" -Cc: Haiyang Zhang -Cc: Stephen Hemminger -Cc: Wei Liu -Cc: Dexuan Cui -Cc: linux-hyperv@vger.kernel.org -Cc: Greg Kroah-Hartman -Reviewed-by: Michael Kelley -Link: https://lore.kernel.org/r/20211126023316.25184-1-rdunlap@infradead.org -Signed-off-by: Wei Liu -Cc: Petr Å tetiar -Signed-off-by: Greg Kroah-Hartman ---- - drivers/hv/Kconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/hv/Kconfig -+++ b/drivers/hv/Kconfig -@@ -16,6 +16,7 @@ config HYPERV_TSCPAGE - config HYPERV_UTILS - tristate "Microsoft Hyper-V Utilities driver" - depends on HYPERV && CONNECTOR && NLS -+ depends on PTP_1588_CLOCK_OPTIONAL - help - Select this option to enable the Hyper-V Utilities. - diff --git a/queue-4.19/series b/queue-4.19/series index db5773cb57b..6158b767699 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -1,6 +1,5 @@ usb-serial-pl2303-add-ibm-device-ids.patch usb-serial-simple-add-nokia-phone-driver.patch -hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch netdevice-add-the-case-if-dev-is-null.patch xfrm-fix-tunnel-model-fragmentation-behavior.patch virtio_console-break-out-of-buf-poll-on-remove.patch diff --git a/queue-5.4/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch b/queue-5.4/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch deleted file mode 100644 index be4ba941d12..00000000000 --- a/queue-5.4/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1dc2f2b81a6a9895da59f3915760f6c0c3074492 Mon Sep 17 00:00:00 2001 -From: Randy Dunlap -Date: Thu, 25 Nov 2021 18:33:16 -0800 -Subject: hv: utils: add PTP_1588_CLOCK to Kconfig to fix build - -From: Randy Dunlap - -commit 1dc2f2b81a6a9895da59f3915760f6c0c3074492 upstream. - -The hyperv utilities use PTP clock interfaces and should depend a -a kconfig symbol such that they will be built as a loadable module or -builtin so that linker errors do not happen. - -Prevents these build errors: - -ld: drivers/hv/hv_util.o: in function `hv_timesync_deinit': -hv_util.c:(.text+0x37d): undefined reference to `ptp_clock_unregister' -ld: drivers/hv/hv_util.o: in function `hv_timesync_init': -hv_util.c:(.text+0x738): undefined reference to `ptp_clock_register' - -Fixes: 3716a49a81ba ("hv_utils: implement Hyper-V PTP source") -Signed-off-by: Randy Dunlap -Reported-by: kernel test robot -Cc: Arnd Bergmann -Cc: "K. Y. Srinivasan" -Cc: Haiyang Zhang -Cc: Stephen Hemminger -Cc: Wei Liu -Cc: Dexuan Cui -Cc: linux-hyperv@vger.kernel.org -Cc: Greg Kroah-Hartman -Reviewed-by: Michael Kelley -Link: https://lore.kernel.org/r/20211126023316.25184-1-rdunlap@infradead.org -Signed-off-by: Wei Liu -Cc: Petr Å tetiar -Signed-off-by: Greg Kroah-Hartman ---- - drivers/hv/Kconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/hv/Kconfig -+++ b/drivers/hv/Kconfig -@@ -17,6 +17,7 @@ config HYPERV_TIMER - config HYPERV_UTILS - tristate "Microsoft Hyper-V Utilities driver" - depends on HYPERV && CONNECTOR && NLS -+ depends on PTP_1588_CLOCK_OPTIONAL - help - Select this option to enable the Hyper-V Utilities. - diff --git a/queue-5.4/series b/queue-5.4/series index 5cda8a0e110..a80565e8633 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,7 +1,6 @@ swiotlb-fix-info-leak-with-dma_from_device.patch usb-serial-pl2303-add-ibm-device-ids.patch usb-serial-simple-add-nokia-phone-driver.patch -hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch netdevice-add-the-case-if-dev-is-null.patch hid-logitech-dj-add-new-lightspeed-receiver-id.patch xfrm-fix-tunnel-model-fragmentation-behavior.patch