4.14-stable patches

added patches:
	usbip-tools-fix-build-error-for-multiple-definition.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index f12cf9297dac95655e47470dcec340cdaaa5867a..0c31fccb021a1d75a56cb3425806dc27064c72fe 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -1,3 +1,4 @@
 btrfs-raid56-simplify-tracking-of-q-stripe-presence.patch
 btrfs-fix-raid6-qstripe-kmap.patch
 pm-runtime-update-device-status-before-letting-suppliers-suspend.patch
+usbip-tools-fix-build-error-for-multiple-definition.patch

diff --git a/queue-4.14/usbip-tools-fix-build-error-for-multiple-definition.patch b/queue-4.14/usbip-tools-fix-build-error-for-multiple-definition.patch
new file mode 100644 (file)
index 0000000..6af31fb
--- /dev/null
+++ b/queue-4.14/usbip-tools-fix-build-error-for-multiple-definition.patch
@@ -0,0 +1,36 @@
+From d5efc2e6b98fe661dbd8dd0d5d5bfb961728e57a Mon Sep 17 00:00:00 2001
+From: Antonio Borneo <borneo.antonio@gmail.com>
+Date: Thu, 18 Jun 2020 02:08:44 +0200
+Subject: usbip: tools: fix build error for multiple definition
+
+From: Antonio Borneo <borneo.antonio@gmail.com>
+
+commit d5efc2e6b98fe661dbd8dd0d5d5bfb961728e57a upstream.
+
+With GCC 10, building usbip triggers error for multiple definition
+of 'udev_context', in:
+- libsrc/vhci_driver.c:18 and
+- libsrc/usbip_host_common.c:27.
+
+Declare as extern the definition in libsrc/usbip_host_common.c.
+
+Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
+Acked-by: Shuah Khan <skhan@linuxfoundation.org>
+Link: https://lore.kernel.org/r/20200618000844.1048309-1-borneo.antonio@gmail.com
+Cc: Petr Štetiar <ynezz@true.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/usb/usbip/libsrc/usbip_host_common.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/usb/usbip/libsrc/usbip_host_common.c
++++ b/tools/usb/usbip/libsrc/usbip_host_common.c
+@@ -35,7 +35,7 @@
+ #include "list.h"
+ #include "sysfs_utils.h"
+ 
+-struct udev *udev_context;
++extern struct udev *udev_context;
+ 
+ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)
+ {