diff options
author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-04-08 14:43:04 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-04-09 19:31:46 +0200 |
commit | be381a7ac70d94c088145e520b8045bd6b5a7957 (patch) | |
tree | cdf32194acac4c471d860bc0b6d4d2d01220f4bc /target/linux/generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch | |
parent | 5a09eb17c2ca3a8fea09509b09edb30c54e9316e (diff) | |
download | upstream-be381a7ac70d94c088145e520b8045bd6b5a7957.tar.gz upstream-be381a7ac70d94c088145e520b8045bd6b5a7957.tar.bz2 upstream-be381a7ac70d94c088145e520b8045bd6b5a7957.zip |
kernel: bump 5.15 to 5.15.33
Deleted (upstreamed):
generic/backport-5.15/350-v5.18-MIPS-pgalloc-fix-memory-leak-caused-by-pgd_free.patch [1]
generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch [2]
generic/pending-5.15/850-0014-PCI-aardvark-Fix-reading-PCI_EXP_RTSTA_PME-bit-on-em.patch [3]
generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch [4]
Manually rebased:
generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch
ramips/patches-5.15/710-at803x.patch
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=d29cda15cab086d82d692de016f7249545d4b6b4
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=d5aad7d63b1b5c1f3c4b69e12c05e7c7d196fae8
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=ed750e22e44366e264bcdf7b1cf0713f08f7980a
[4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=0fe94b84c43cfea867e1721606185e8686d7d32f
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
[Refresh patches again]
[Remove generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch')
-rw-r--r-- | target/linux/generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/target/linux/generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch b/target/linux/generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch deleted file mode 100644 index 7af35ab87e..0000000000 --- a/target/linux/generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch +++ /dev/null @@ -1,46 +0,0 @@ -From fba2153a200716c1fec1eafda7356bb347589efb Mon Sep 17 00:00:00 2001 -From: Randy Dunlap <rdunlap@infradead.org> -Date: Thu, 25 Nov 2021 18:33:16 -0800 -Subject: [PATCH] hv: utils: add PTP_1588_CLOCK to Kconfig to fix build - -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' - -References: https://lore.kernel.org/stable/20220328093115.7486-1-ynezz@true.cz/T/#u -Fixes: 3716a49a81ba ("hv_utils: implement Hyper-V PTP source") -Signed-off-by: Randy Dunlap <rdunlap@infradead.org> -Reported-by: kernel test robot <lkp@intel.com> -Cc: Arnd Bergmann <arnd@arndb.de> -Cc: "K. Y. Srinivasan" <kys@microsoft.com> -Cc: Haiyang Zhang <haiyangz@microsoft.com> -Cc: Stephen Hemminger <sthemmin@microsoft.com> -Cc: Wei Liu <wei.liu@kernel.org> -Cc: Dexuan Cui <decui@microsoft.com> -Cc: linux-hyperv@vger.kernel.org -Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Reviewed-by: Michael Kelley <mikelley@microsoft.com> -Link: https://lore.kernel.org/r/20211126023316.25184-1-rdunlap@infradead.org -Signed-off-by: Wei Liu <wei.liu@kernel.org> -(cherry picked from commit 1dc2f2b81a6a9895da59f3915760f6c0c3074492) ---- - drivers/hv/Kconfig | 1 + - 1 file changed, 1 insertion(+) - ---- 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. - |