From: Greg Kroah-Hartman Date: Wed, 22 Dec 2021 07:55:29 +0000 (+0100) Subject: drop hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch from all queues X-Git-Tag: v4.4.296~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=255d57b5421b5df31a49ed1ecb9a8a353fa33111;p=thirdparty%2Fkernel%2Fstable-queue.git drop hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch from all queues --- 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 65046ca93d2..00000000000 --- a/queue-4.14/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 57110014247dc19c0f81fa0e77e4ff321af434e3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 25 Nov 2021 18:33:16 -0800 -Subject: hv: utils: add PTP_1588_CLOCK to Kconfig to fix build - -From: Randy Dunlap - -[ Upstream commit 1dc2f2b81a6a9895da59f3915760f6c0c3074492 ] - -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 -Signed-off-by: Sasha Levin ---- - drivers/hv/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig -index 247a62604d1f6..23ad80dbe7af0 100644 ---- 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. - --- -2.33.0 - diff --git a/queue-4.14/series b/queue-4.14/series index a246e39bd23..acd4e43dee0 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -14,7 +14,6 @@ audit-improve-robustness-of-the-audit-queue-handling.patch nfsd-fix-use-after-free-due-to-delegation-race.patch x86-make-arch_use_memremap_prot-a-generic-kconfig-symbol.patch x86-sme-explicitly-map-new-efi-memmap-table-as-encrypted.patch -hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch arm-socfpga-dts-fix-qspi-node-compatible.patch dmaengine-st_fdma-fix-module_alias.patch soc-tegra-fuse-fix-bitwise-vs.-logical-or-warning.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 9b820a3890c..00000000000 --- a/queue-4.19/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8f6ccf5edd6ba7ba7d68cf818ede46fde49a0752 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 25 Nov 2021 18:33:16 -0800 -Subject: hv: utils: add PTP_1588_CLOCK to Kconfig to fix build - -From: Randy Dunlap - -[ Upstream commit 1dc2f2b81a6a9895da59f3915760f6c0c3074492 ] - -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 -Signed-off-by: Sasha Levin ---- - drivers/hv/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig -index 1c1a2514d6f31..b1c93441900ad 100644 ---- 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. - --- -2.33.0 - diff --git a/queue-4.19/series b/queue-4.19/series index 1eb5a1d7911..05777d499b2 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -15,7 +15,6 @@ nfsd-fix-use-after-free-due-to-delegation-race.patch x86-make-arch_use_memremap_prot-a-generic-kconfig-symbol.patch x86-sme-explicitly-map-new-efi-memmap-table-as-encrypted.patch mac80211-track-only-qos-data-frames-for-admission-co.patch -hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch arm-socfpga-dts-fix-qspi-node-compatible.patch sch_cake-do-not-call-cake_destroy-from-cake_init.patch dmaengine-st_fdma-fix-module_alias.patch diff --git a/queue-5.10/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch b/queue-5.10/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch deleted file mode 100644 index 863a55a10aa..00000000000 --- a/queue-5.10/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6f2eb39d91898382c1367659805a14f28a5dbc8a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 25 Nov 2021 18:33:16 -0800 -Subject: hv: utils: add PTP_1588_CLOCK to Kconfig to fix build - -From: Randy Dunlap - -[ Upstream commit 1dc2f2b81a6a9895da59f3915760f6c0c3074492 ] - -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 -Signed-off-by: Sasha Levin ---- - drivers/hv/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig -index 79e5356a737a2..210e532ac277f 100644 ---- 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. - --- -2.33.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 0164ed1f70b..62ce2054ade 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -20,7 +20,6 @@ arm64-dts-rockchip-fix-rk3308-roc-cc-vcc-sd-supply.patch arm64-dts-rockchip-fix-rk3399-leez-p710-vcc3v3-lan-s.patch arm64-dts-rockchip-fix-audio-supply-for-rock-pi-4.patch mac80211-track-only-qos-data-frames-for-admission-co.patch -hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch tee-amdtee-fix-an-is_err-vs-null-bug.patch ceph-fix-duplicate-increment-of-opened_inodes-metric.patch ceph-initialize-pathlen-variable-in-reconnect_caps_c.patch diff --git a/queue-5.15/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch b/queue-5.15/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch deleted file mode 100644 index fc1f48661c7..00000000000 --- a/queue-5.15/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9354a3f51e6e222dbdbe38f4e006d8b986185b1b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 25 Nov 2021 18:33:16 -0800 -Subject: hv: utils: add PTP_1588_CLOCK to Kconfig to fix build - -From: Randy Dunlap - -[ Upstream commit 1dc2f2b81a6a9895da59f3915760f6c0c3074492 ] - -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 -Signed-off-by: Sasha Levin ---- - drivers/hv/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig -index d1123ceb38f3f..9a074cbdef78c 100644 ---- a/drivers/hv/Kconfig -+++ b/drivers/hv/Kconfig -@@ -18,6 +18,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. - --- -2.33.0 - diff --git a/queue-5.15/series b/queue-5.15/series index f59d2960584..ded2736cb5d 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -43,7 +43,6 @@ arm64-dts-rockchip-fix-poweroff-on-helios64.patch dmaengine-idxd-add-halt-interrupt-support.patch dmaengine-idxd-fix-calling-wq-quiesce-inside-spinloc.patch mac80211-track-only-qos-data-frames-for-admission-co.patch -hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch tee-amdtee-fix-an-is_err-vs-null-bug.patch ceph-fix-duplicate-increment-of-opened_inodes-metric.patch ceph-initialize-pathlen-variable-in-reconnect_caps_c.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 0ddfdc33b8a..00000000000 --- a/queue-5.4/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9e7c0684af28d3f2e16e2b6d9b235a97653f896e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 25 Nov 2021 18:33:16 -0800 -Subject: hv: utils: add PTP_1588_CLOCK to Kconfig to fix build - -From: Randy Dunlap - -[ Upstream commit 1dc2f2b81a6a9895da59f3915760f6c0c3074492 ] - -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 -Signed-off-by: Sasha Levin ---- - drivers/hv/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig -index 79e5356a737a2..210e532ac277f 100644 ---- 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. - --- -2.33.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 3ef02be1a8c..0816c63b004 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -12,7 +12,6 @@ arm64-dts-rockchip-remove-mmc-hs400-enhanced-strobe-.patch arm64-dts-rockchip-fix-rk3399-leez-p710-vcc3v3-lan-s.patch arm64-dts-rockchip-fix-audio-supply-for-rock-pi-4.patch mac80211-track-only-qos-data-frames-for-admission-co.patch -hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch arm-socfpga-dts-fix-qspi-node-compatible.patch clk-don-t-parent-clks-until-the-parent-is-fully-regi.patch selftests-net-correct-ping6-expected-rc-from-2-to-1.patch