From patchwork Fri Mar 5 12:09:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1447788 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=dSJEVDsk; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=g6GMZvxH; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DsRRN00Ybz9sCD for ; Fri, 5 Mar 2021 23:11:27 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=h3al7nSPMd/pwU207v7SWssDBerd3L8e9N7LHm/ErGI=; b=dSJEVDskSw5/QslVupyTa1wzNN LZ7Mm+qnHwlyh5xuaq2Tpr3wDlF8S/uWC8QeFmUKLQBSfu1tLsFqKYykIfwVIWR09oPhDg1PSVEHu aOGK/4ttsGwrd3eL8jnymnlycLAU3qiPlNYP3wgbqkpNtTLU+ISPGpczfx7rXU86+3tiUP6eQ5CqF TyB0G9vx+4F11f5O7CLUeIq7fjamWqp4u5HdLePf74RG+mn21Bowh3JoyfHiomIZKHlwLG5s7jrKN zfQP5FsbnksYd22GMLhKKrpkZNQmiT4amThpF3RdP5uEklIUjPi0kvxXyiR5k09fukYfJ1GIDe7UG oTJelz+A==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lI9H4-00EuIm-No; Fri, 05 Mar 2021 12:09:42 +0000 Received: from mail-qv1-xf2c.google.com ([2607:f8b0:4864:20::f2c]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lI9Gz-00EuHa-Vs for openwrt-devel@lists.openwrt.org; Fri, 05 Mar 2021 12:09:40 +0000 Received: by mail-qv1-xf2c.google.com with SMTP id cw15so810446qvb.11 for ; Fri, 05 Mar 2021 04:09:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LVW8f1tkYwMpEFg7PAIFPYVWaRWThoKYfFVHrO7StP0=; b=g6GMZvxHqXMXzQvqZOSMkwgm4XR47joK2PqxdYUmg0DED7LXDwt1oIlpW1/HS5LfTw NqbjNBFTqLOz4i2uHCzYOPHAL8k9rkrhGcxWtBjo7gKL62I57wqMb65ut9Stu2qDwT3H Fjc9/yo1khrjbF5iEbOTPfdp0NSDEyn1mCDAhQ9vHvD2mmRM6YGQL/1OIZ71rVR1JM8Z jI1jRqkRFY034kpavlyrce7hMj7YWeZYMSrJpkq2vCRJBJ7mhEpiMBQ95EL70YTQxaxZ AdGAwLTk9RMkjVwXO3qUXoFzMNEKvxNpyQC02HlxTL5d+mi798xPAnHVqneLfuorDu6w quPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LVW8f1tkYwMpEFg7PAIFPYVWaRWThoKYfFVHrO7StP0=; b=Qs/8Qr7Y0gUCYUQBFroavQTO82HRSk9uDCb9dDrru4EZmb1ZW97jvqlatfp2qhBuXr K8rCEmCRNhCimepW69BURiD9Z+Zj3iJWJk383TBZofYTusk+Lco2JOgZyJnZ/CDYEDn8 ntVCjqWBcKbwp9NaGsJBqf7W2zDk1SzdVcMl1ewRm6DQEYhEWfiCnrijeaYKiUHXU91m 197MH/eLAAfWlv+Ov7tic7GUxro03buP370BFZuKt7QJ5H0r2katTPc5wM1sjgLwOTPB n+aVweDG+BAWqBiRUnaj2tx0ba9Tq6374j+tAdvI1oCrkypdrxCQODVw9iMe0gKw2fcy cp/g== X-Gm-Message-State: AOAM531qIFuz420HhdnW4iICZ7g+pC7QdFj2QUQpk/dHLZZwLW/0t674 Xc72SxIzQrOwrCHbhx8w7NHEiD/KXw== X-Google-Smtp-Source: ABdhPJzYGcY8J6ke+qtF/xBVLevFY+oZZ0eEGp5YkIGkUmOBNyOyCU2aCZr+AhMUKQosqmYk0DOZSA== X-Received: by 2002:a05:6214:b27:: with SMTP id w7mr8584312qvj.34.1614946176892; Fri, 05 Mar 2021 04:09:36 -0800 (PST) Received: from presler.lan (a109-49-2-167.cpe.netcabo.pt. [109.49.2.167]) by smtp.gmail.com with ESMTPSA id r67sm1558001qkd.93.2021.03.05.04.09.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 04:09:36 -0800 (PST) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Cc: rosenp@gmail.com, Rui Salvaterra Subject: [PATCH] kernel: backport GCC 10 usbip build fix for 5.4 Date: Fri, 5 Mar 2021 12:09:31 +0000 Message-Id: <20210305120931.692973-1-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210305_120938_270964_D1AB3CBB X-CRM114-Status: GOOD ( 12.25 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "desiato.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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." Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:f2c listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rsalvaterra[at]gmail.com] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 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 --- ...-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 +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 +Acked-by: Shuah Khan +Link: https://lore.kernel.org/r/20200618000844.1048309-1-borneo.antonio@gmail.com +Signed-off-by: Greg Kroah-Hartman +--- + 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) + {