sravan/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux515-tkg: Update rebased version of winesync patchset for 5.15 (#355)

Browse Source
This commit is contained in:
Dmitry Skvortsov
2021-11-12 16:19:54 +03:00
committed by GitHub
parent d006ecd4ad
commit ba636511f4
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PKGBUILD
View File

@@ -650,7 +650,7 @@ case $_basever in
'6c4f0099896f69e56ebd8c9eac266ac8ad993acecd50945e0e84ef6f95f9ddca' '6c4f0099896f69e56ebd8c9eac266ac8ad993acecd50945e0e84ef6f95f9ddca'
'c8f7c50d9b1418ba22b5ca735c47111a162be416109714d26a674162e5b2cb97' 'c8f7c50d9b1418ba22b5ca735c47111a162be416109714d26a674162e5b2cb97'
'63a2ddf7ca9d3922f4eac3ac66bc37ffb10ad8b18b3e596832d3faa66b93dfa6' '63a2ddf7ca9d3922f4eac3ac66bc37ffb10ad8b18b3e596832d3faa66b93dfa6'
'034d12a73b507133da2c69a34d61efd2f6b6618549650aa26d748142d22002e1' 'a71ea523f0a7bcd24e2ad144ff12160aa03dc3f0c64daceac8dc1aae523d4491'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
'decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c' 'decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c'

28
linux-tkg-patches/5.15/0007-v5.15-winesync.patch
View File

@@ -1,5 +1,5 @@
diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt
index 63fd4e6a014b..dc9a30b5f1a2 100644 index 922c23bb4372..ae39732318a7 100644
--- a/Documentation/admin-guide/devices.txt --- a/Documentation/admin-guide/devices.txt
+++ b/Documentation/admin-guide/devices.txt +++ b/Documentation/admin-guide/devices.txt
@@ -376,8 +376,9 @@ @@ -376,8 +376,9 @@
@@ -14,22 +14,22 @@ index 63fd4e6a014b..dc9a30b5f1a2 100644
11 char Raw keyboard device (Linux/SPARC only) 11 char Raw keyboard device (Linux/SPARC only)
diff --git a/Documentation/userspace-api/index.rst b/Documentation/userspace-api/index.rst diff --git a/Documentation/userspace-api/index.rst b/Documentation/userspace-api/index.rst
index d29b020e5622..d2ddbf9ad8cb 100644 index c432be070f67..fde565a8005c 100644
--- a/Documentation/userspace-api/index.rst --- a/Documentation/userspace-api/index.rst
+++ b/Documentation/userspace-api/index.rst +++ b/Documentation/userspace-api/index.rst
@@ -25,6 +25,7 @@ place where this information is gathered. @@ -28,6 +28,7 @@ place where this information is gathered.
iommu
media/index media/index
sysfs-platform_profile sysfs-platform_profile
vduse
+ winesync + winesync
.. only:: subproject and html .. only:: subproject and html
diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst
index 599bd4493944..825c6b2d2623 100644 index 6655d929a351..9d5f1f87c2ee 100644
--- a/Documentation/userspace-api/ioctl/ioctl-number.rst --- a/Documentation/userspace-api/ioctl/ioctl-number.rst
+++ b/Documentation/userspace-api/ioctl/ioctl-number.rst +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
@@ -366,6 +366,8 @@ Code Seq# Include File Comments @@ -370,6 +370,8 @@ Code Seq# Include File Comments
<mailto:thomas@winischhofer.net> <mailto:thomas@winischhofer.net>
0xF6 all LTTng Linux Trace Toolkit Next Generation 0xF6 all LTTng Linux Trace Toolkit Next Generation
<mailto:mathieu.desnoyers@efficios.com> <mailto:mathieu.desnoyers@efficios.com>
@@ -418,10 +418,10 @@ index 000000000000..751c70f1ffce
+ Fails with ``ENOMEM`` if not enough memory is available, or + Fails with ``ENOMEM`` if not enough memory is available, or
+ ``EINTR`` if a signal is received. + ``EINTR`` if a signal is received.
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index 9450e052f1b1..d33e317759bf 100644 index 3b79fd441dde..0dfd74b56fbe 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -19351,6 +19351,15 @@ M: David Härdeman <david@hardeman.nu> @@ -20227,6 +20227,15 @@ M: David Härdeman <david@hardeman.nu>
S: Maintained S: Maintained
F: drivers/media/rc/winbond-cir.c F: drivers/media/rc/winbond-cir.c
@@ -438,10 +438,10 @@ index 9450e052f1b1..d33e317759bf 100644
M: William Breathitt Gray <vilhelm.gray@gmail.com> M: William Breathitt Gray <vilhelm.gray@gmail.com>
L: linux-watchdog@vger.kernel.org L: linux-watchdog@vger.kernel.org
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index f532c59bb59b..496f20d69914 100644 index 0f5a49fc7c9e..e21e4424d6a2 100644
--- a/drivers/misc/Kconfig --- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig
@@ -445,6 +445,17 @@ config HISI_HIKEY_USB @@ -470,6 +470,17 @@ config HISI_HIKEY_USB
switching between the dual-role USB-C port and the USB-A host ports switching between the dual-role USB-C port and the USB-A host ports
using only one USB controller. using only one USB controller.
@@ -460,13 +460,13 @@ index f532c59bb59b..496f20d69914 100644
source "drivers/misc/eeprom/Kconfig" source "drivers/misc/eeprom/Kconfig"
source "drivers/misc/cb710/Kconfig" source "drivers/misc/cb710/Kconfig"
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 99b6f15a3c70..327c9628c479 100644 index a086197af544..0255d6a05093 100644
--- a/drivers/misc/Makefile --- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile +++ b/drivers/misc/Makefile
@@ -56,3 +56,4 @@ obj-$(CONFIG_HABANA_AI) += habanalabs/ @@ -59,3 +59,4 @@ obj-$(CONFIG_UACCE) += uacce/
obj-$(CONFIG_UACCE) += uacce/
obj-$(CONFIG_XILINX_SDFEC) += xilinx_sdfec.o obj-$(CONFIG_XILINX_SDFEC) += xilinx_sdfec.o
obj-$(CONFIG_HISI_HIKEY_USB) += hisi_hikey_usb.o obj-$(CONFIG_HISI_HIKEY_USB) += hisi_hikey_usb.o
obj-$(CONFIG_HI6421V600_IRQ) += hi6421v600-irq.o
+obj-$(CONFIG_WINESYNC) += winesync.o +obj-$(CONFIG_WINESYNC) += winesync.o
diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c
new file mode 100644 new file mode 100644
@@ -1601,7 +1601,7 @@ index 000000000000..efc591795249
+ +
+#endif +#endif
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index 6c575cf34a71..7f43a50ee19e 100644 index c852eb40c4f7..a366016d6254 100644
--- a/tools/testing/selftests/Makefile --- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile
@@ -9,6 +9,7 @@ TARGETS += core @@ -9,6 +9,7 @@ TARGETS += core