Backport of 'usbip: tools: fix build error for multiple definition' [Was: Re: [PATCH] kernel: backport GCC 10 usbip build fix for 5.4]

[Petr Štetiar]

Hi stable,

can we please get following patch from v5.9-rc1~142^2~213 backported into the
stable kernels?

 From d5efc2e6b98fe661dbd8dd0d5d5bfb961728e57a Mon Sep 17 00:00:00 2001
 From: Antonio Borneo <borneo.antonio at gmail.com>
 Date: Thu, 18 Jun 2020 02:08:44 +0200
 Subject: usbip: tools: fix build error for multiple definition

Thanks!

Cheers,

Petr

> From the original commit message:
> 
> "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: Rui Salvaterra <rsalvaterra at gmail.com>
> ---
>  ...-build-error-for-multiple-definition.patch | 33 +++++++++++++++++++
>  1 file changed, 33 insertions(+)
>  create mode 100644 target/linux/generic/backport-5.4/831-v5.9-usbip-tools-fix-build-error-for-multiple-definition.patch
> 
> diff --git a/target/linux/generic/backport-5.4/831-v5.9-usbip-tools-fix-build-error-for-multiple-definition.patch b/target/linux/generic/backport-5.4/831-v5.9-usbip-tools-fix-build-error-for-multiple-definition.patch
> new file mode 100644
> index 0000000000..03f27fb528
> --- /dev/null
> +++ b/target/linux/generic/backport-5.4/831-v5.9-usbip-tools-fix-build-error-for-multiple-definition.patch
> @@ -0,0 +1,33 @@
> +From d5efc2e6b98fe661dbd8dd0d5d5bfb961728e57a Mon Sep 17 00:00:00 2001
> +From: Antonio Borneo <borneo.antonio at gmail.com>
> +Date: Thu, 18 Jun 2020 02:08:44 +0200
> +Subject: usbip: tools: fix build error for multiple definition
> +
> +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 at gmail.com>
> +Acked-by: Shuah Khan <skhan at linuxfoundation.org>
> +Link: https://lore.kernel.org/r/20200618000844.1048309-1-borneo.antonio@gmail.com
> +Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> +---
> + tools/usb/usbip/libsrc/usbip_host_common.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +(limited to 'tools/usb/usbip')
> +
> +--- a/tools/usb/usbip/libsrc/usbip_host_common.c
> ++++ b/tools/usb/usbip/libsrc/usbip_host_common.c
> +@@ -23,7 +23,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)
> + {
> -- 
> 2.30.1