From: Sasha Levin sashal@kernel.org
stable inclusion from stable-v5.10.111 commit 84e5dfc05f37bbb7203af4ec6bd18a17d37abacf category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5GL1Z
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...
--------------------------------
This reverts commit c4dc584a2d4c8d74b054f09d67e0a076767bdee5.
On Sat, Apr 09, 2022 at 09:07:51AM -0700, Randy Dunlap wrote:
According to https://bugzilla.kernel.org/show_bug.cgi?id=215823, c4dc584a2d4c8d74b054f09d67e0a076767bdee5 ("hv: utils: add PTP_1588_CLOCK to Kconfig to fix build") is a problem for 5.10 since CONFIG_PTP_1588_CLOCK_OPTIONAL does not exist in 5.10. This prevents the hyper-V NIC timestamping from working, so please revert that commit.
Signed-off-by: Sasha Levin sashal@kernel.org Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com Reviewed-by: Wei Li liwei391@huawei.com --- drivers/hv/Kconfig | 1 - 1 file changed, 1 deletion(-)
diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig index 210e532ac277..79e5356a737a 100644 --- a/drivers/hv/Kconfig +++ b/drivers/hv/Kconfig @@ -17,7 +17,6 @@ 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.