From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7E1D9A04A3 for ; Fri, 5 Jun 2020 20:27:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 602C51D55E; Fri, 5 Jun 2020 20:27:46 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id DE8A01D525 for ; Fri, 5 Jun 2020 20:27:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IsgOAbvAb2EX4bCmxKTy16/MDVC7p/N+2YByIB3wW5A=; b=im6O8bVExv731GK5teSadH3rr3mi7OBysJWo2F6tYRhZQxOJwiykSpCqP/GSS3775+jpjY UfBWUp+w7CvOt5a48/rJjcaajf8LnmYcBqZmII/x4PpThVhnnnCMvf86HnzVWHhSYxy372 HbZR5Ze0WILX/Wdz5Ym+xqqKvaDxpjc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-287-V0aH_T57PXaNvXQrEh2_wA-1; Fri, 05 Jun 2020 14:27:33 -0400 X-MC-Unique: V0aH_T57PXaNvXQrEh2_wA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B5F0F107ACCA; Fri, 5 Jun 2020 18:27:32 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id D221D60C47; Fri, 5 Jun 2020 18:27:31 +0000 (UTC) From: Kevin Traynor To: Xiaoyun Li Cc: Ferruh Yigit , dpdk stable Date: Fri, 5 Jun 2020 19:25:01 +0100 Message-Id: <20200605182525.22483-64-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe/base: update copyright' has been queued to LTS release 18.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/10/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/92f70728b24da74542570db8359679fd370026cd Thanks. Kevin. --- >From 92f70728b24da74542570db8359679fd370026cd Mon Sep 17 00:00:00 2001 From: Xiaoyun Li Date: Mon, 18 May 2020 16:41:36 +0800 Subject: [PATCH] net/ixgbe/base: update copyright [ upstream commit e071d4af8f2918df9542592acc877d75d40c783a ] Clarify Intel copyright and update the date to 2020. Fixes: 9db3087f4f77 ("net/ixgbe/base: update the license") Signed-off-by: Xiaoyun Li Reviewed-by: Ferruh Yigit --- drivers/net/ixgbe/base/README | 34 +++--------------------- drivers/net/ixgbe/base/ixgbe_82598.c | 2 +- drivers/net/ixgbe/base/ixgbe_82598.h | 2 +- drivers/net/ixgbe/base/ixgbe_82599.c | 2 +- drivers/net/ixgbe/base/ixgbe_82599.h | 2 +- drivers/net/ixgbe/base/ixgbe_api.c | 2 +- drivers/net/ixgbe/base/ixgbe_api.h | 2 +- drivers/net/ixgbe/base/ixgbe_common.c | 2 +- drivers/net/ixgbe/base/ixgbe_common.h | 2 +- drivers/net/ixgbe/base/ixgbe_dcb.c | 2 +- drivers/net/ixgbe/base/ixgbe_dcb.h | 2 +- drivers/net/ixgbe/base/ixgbe_dcb_82598.c | 2 +- drivers/net/ixgbe/base/ixgbe_dcb_82598.h | 2 +- drivers/net/ixgbe/base/ixgbe_dcb_82599.c | 2 +- drivers/net/ixgbe/base/ixgbe_dcb_82599.h | 2 +- drivers/net/ixgbe/base/ixgbe_hv_vf.c | 2 +- drivers/net/ixgbe/base/ixgbe_hv_vf.h | 2 +- drivers/net/ixgbe/base/ixgbe_mbx.c | 2 +- drivers/net/ixgbe/base/ixgbe_mbx.h | 2 +- drivers/net/ixgbe/base/ixgbe_osdep.h | 2 +- drivers/net/ixgbe/base/ixgbe_phy.c | 2 +- drivers/net/ixgbe/base/ixgbe_phy.h | 2 +- drivers/net/ixgbe/base/ixgbe_type.h | 2 +- drivers/net/ixgbe/base/ixgbe_vf.c | 2 +- drivers/net/ixgbe/base/ixgbe_vf.h | 2 +- drivers/net/ixgbe/base/ixgbe_x540.c | 2 +- drivers/net/ixgbe/base/ixgbe_x540.h | 2 +- drivers/net/ixgbe/base/ixgbe_x550.c | 2 +- drivers/net/ixgbe/base/ixgbe_x550.h | 2 +- drivers/net/ixgbe/base/meson.build | 2 +- 30 files changed, 32 insertions(+), 60 deletions(-) diff --git a/drivers/net/ixgbe/base/README b/drivers/net/ixgbe/base/README index 431be0260e..a48b14ed27 100644 --- a/drivers/net/ixgbe/base/README +++ b/drivers/net/ixgbe/base/README @@ -1,33 +1,5 @@ -.. - BSD LICENSE - - Copyright(c) 2010-2018 Intel Corporation. All rights reserved. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name of Intel Corporation nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2020 Intel Corporation + */ Intel® IXGBE driver diff --git a/drivers/net/ixgbe/base/ixgbe_82598.c b/drivers/net/ixgbe/base/ixgbe_82598.c index 245ff75d55..c83e1c6b30 100644 --- a/drivers/net/ixgbe/base/ixgbe_82598.c +++ b/drivers/net/ixgbe/base/ixgbe_82598.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_82598.h b/drivers/net/ixgbe/base/ixgbe_82598.h index 8013f495ec..7bad5e12d3 100644 --- a/drivers/net/ixgbe/base/ixgbe_82598.h +++ b/drivers/net/ixgbe/base/ixgbe_82598.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_82599.c b/drivers/net/ixgbe/base/ixgbe_82599.c index 96bdde62c8..9cd0b1428c 100644 --- a/drivers/net/ixgbe/base/ixgbe_82599.c +++ b/drivers/net/ixgbe/base/ixgbe_82599.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_82599.h b/drivers/net/ixgbe/base/ixgbe_82599.h index a32eb1f517..238481983f 100644 --- a/drivers/net/ixgbe/base/ixgbe_82599.h +++ b/drivers/net/ixgbe/base/ixgbe_82599.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_api.c b/drivers/net/ixgbe/base/ixgbe_api.c index 873c07999c..0a22df3d06 100644 --- a/drivers/net/ixgbe/base/ixgbe_api.c +++ b/drivers/net/ixgbe/base/ixgbe_api.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_api.h b/drivers/net/ixgbe/base/ixgbe_api.h index ff8f7b2611..33e7c3c215 100644 --- a/drivers/net/ixgbe/base/ixgbe_api.h +++ b/drivers/net/ixgbe/base/ixgbe_api.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c index 62ff767230..4eb98dc198 100644 --- a/drivers/net/ixgbe/base/ixgbe_common.c +++ b/drivers/net/ixgbe/base/ixgbe_common.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_common.h b/drivers/net/ixgbe/base/ixgbe_common.h index 3bb2475119..7a31f088c4 100644 --- a/drivers/net/ixgbe/base/ixgbe_common.h +++ b/drivers/net/ixgbe/base/ixgbe_common.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_dcb.c b/drivers/net/ixgbe/base/ixgbe_dcb.c index a590e0e07c..53def2146e 100644 --- a/drivers/net/ixgbe/base/ixgbe_dcb.c +++ b/drivers/net/ixgbe/base/ixgbe_dcb.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_dcb.h b/drivers/net/ixgbe/base/ixgbe_dcb.h index 503d06018f..c2a1013ac0 100644 --- a/drivers/net/ixgbe/base/ixgbe_dcb.h +++ b/drivers/net/ixgbe/base/ixgbe_dcb.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82598.c b/drivers/net/ixgbe/base/ixgbe_dcb_82598.c index d87cb58857..bb309e28fd 100644 --- a/drivers/net/ixgbe/base/ixgbe_dcb_82598.c +++ b/drivers/net/ixgbe/base/ixgbe_dcb_82598.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82598.h b/drivers/net/ixgbe/base/ixgbe_dcb_82598.h index 1a14744482..8f36881378 100644 --- a/drivers/net/ixgbe/base/ixgbe_dcb_82598.h +++ b/drivers/net/ixgbe/base/ixgbe_dcb_82598.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82599.c b/drivers/net/ixgbe/base/ixgbe_dcb_82599.c index f4f0ff0190..04e0d1fb7d 100644 --- a/drivers/net/ixgbe/base/ixgbe_dcb_82599.c +++ b/drivers/net/ixgbe/base/ixgbe_dcb_82599.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82599.h b/drivers/net/ixgbe/base/ixgbe_dcb_82599.h index 085ada27f7..7bd1d6a325 100644 --- a/drivers/net/ixgbe/base/ixgbe_dcb_82599.h +++ b/drivers/net/ixgbe/base/ixgbe_dcb_82599.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_hv_vf.c b/drivers/net/ixgbe/base/ixgbe_hv_vf.c index 67a124d8d1..6005c4ac93 100644 --- a/drivers/net/ixgbe/base/ixgbe_hv_vf.c +++ b/drivers/net/ixgbe/base/ixgbe_hv_vf.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_hv_vf.h b/drivers/net/ixgbe/base/ixgbe_hv_vf.h index 9664f3bdbf..dd2e1eee4e 100644 --- a/drivers/net/ixgbe/base/ixgbe_hv_vf.h +++ b/drivers/net/ixgbe/base/ixgbe_hv_vf.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_mbx.c b/drivers/net/ixgbe/base/ixgbe_mbx.c index cb82942dfa..13bdb5f68f 100644 --- a/drivers/net/ixgbe/base/ixgbe_mbx.c +++ b/drivers/net/ixgbe/base/ixgbe_mbx.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_mbx.h b/drivers/net/ixgbe/base/ixgbe_mbx.h index 5d32cbc074..1a45e49c2f 100644 --- a/drivers/net/ixgbe/base/ixgbe_mbx.h +++ b/drivers/net/ixgbe/base/ixgbe_mbx.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h index ea8dc1cbe5..a4eb71777c 100644 --- a/drivers/net/ixgbe/base/ixgbe_osdep.h +++ b/drivers/net/ixgbe/base/ixgbe_osdep.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c index dd118f9170..a8243fa974 100644 --- a/drivers/net/ixgbe/base/ixgbe_phy.c +++ b/drivers/net/ixgbe/base/ixgbe_phy.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_phy.h b/drivers/net/ixgbe/base/ixgbe_phy.h index f1605f2cc9..a06c3be170 100644 --- a/drivers/net/ixgbe/base/ixgbe_phy.h +++ b/drivers/net/ixgbe/base/ixgbe_phy.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h index 077b8f01c7..15e9370105 100644 --- a/drivers/net/ixgbe/base/ixgbe_type.h +++ b/drivers/net/ixgbe/base/ixgbe_type.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_vf.c b/drivers/net/ixgbe/base/ixgbe_vf.c index aac37822e4..7f69ece107 100644 --- a/drivers/net/ixgbe/base/ixgbe_vf.c +++ b/drivers/net/ixgbe/base/ixgbe_vf.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_vf.h b/drivers/net/ixgbe/base/ixgbe_vf.h index dba643fced..be58b4f76e 100644 --- a/drivers/net/ixgbe/base/ixgbe_vf.h +++ b/drivers/net/ixgbe/base/ixgbe_vf.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_x540.c b/drivers/net/ixgbe/base/ixgbe_x540.c index f00f0eae7e..d65f47c181 100644 --- a/drivers/net/ixgbe/base/ixgbe_x540.c +++ b/drivers/net/ixgbe/base/ixgbe_x540.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_x540.h b/drivers/net/ixgbe/base/ixgbe_x540.h index 231dfe56e5..ba79847d11 100644 --- a/drivers/net/ixgbe/base/ixgbe_x540.h +++ b/drivers/net/ixgbe/base/ixgbe_x540.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c index a920a146e7..f2c8e5425e 100644 --- a/drivers/net/ixgbe/base/ixgbe_x550.c +++ b/drivers/net/ixgbe/base/ixgbe_x550.c @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/ixgbe_x550.h b/drivers/net/ixgbe/base/ixgbe_x550.h index 3bd98f243d..10086ab423 100644 --- a/drivers/net/ixgbe/base/ixgbe_x550.h +++ b/drivers/net/ixgbe/base/ixgbe_x550.h @@ -1,4 +1,4 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2001-2018 + * Copyright(c) 2001-2020 Intel Corporation */ diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build index 21ac64bf5c..e4807e59a5 100644 --- a/drivers/net/ixgbe/base/meson.build +++ b/drivers/net/ixgbe/base/meson.build @@ -1,4 +1,4 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation +# Copyright(c) 2017-2020 Intel Corporation sources = [ -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:54.312513630 +0100 +++ 0064-net-ixgbe-base-update-copyright.patch 2020-06-05 19:20:50.917038382 +0100 @@ -1 +1 @@ -From e071d4af8f2918df9542592acc877d75d40c783a Mon Sep 17 00:00:00 2001 +From 92f70728b24da74542570db8359679fd370026cd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e071d4af8f2918df9542592acc877d75d40c783a ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -14,31 +15,31 @@ - drivers/net/ixgbe/base/README | 2 +- - drivers/net/ixgbe/base/ixgbe_82598.c | 2 +- - drivers/net/ixgbe/base/ixgbe_82598.h | 2 +- - drivers/net/ixgbe/base/ixgbe_82599.c | 2 +- - drivers/net/ixgbe/base/ixgbe_82599.h | 2 +- - drivers/net/ixgbe/base/ixgbe_api.c | 2 +- - drivers/net/ixgbe/base/ixgbe_api.h | 2 +- - drivers/net/ixgbe/base/ixgbe_common.c | 2 +- - drivers/net/ixgbe/base/ixgbe_common.h | 2 +- - drivers/net/ixgbe/base/ixgbe_dcb.c | 2 +- - drivers/net/ixgbe/base/ixgbe_dcb.h | 2 +- - drivers/net/ixgbe/base/ixgbe_dcb_82598.c | 2 +- - drivers/net/ixgbe/base/ixgbe_dcb_82598.h | 2 +- - drivers/net/ixgbe/base/ixgbe_dcb_82599.c | 2 +- - drivers/net/ixgbe/base/ixgbe_dcb_82599.h | 2 +- - drivers/net/ixgbe/base/ixgbe_hv_vf.c | 2 +- - drivers/net/ixgbe/base/ixgbe_hv_vf.h | 2 +- - drivers/net/ixgbe/base/ixgbe_mbx.c | 2 +- - drivers/net/ixgbe/base/ixgbe_mbx.h | 2 +- - drivers/net/ixgbe/base/ixgbe_osdep.h | 2 +- - drivers/net/ixgbe/base/ixgbe_phy.c | 2 +- - drivers/net/ixgbe/base/ixgbe_phy.h | 2 +- - drivers/net/ixgbe/base/ixgbe_type.h | 2 +- - drivers/net/ixgbe/base/ixgbe_vf.c | 2 +- - drivers/net/ixgbe/base/ixgbe_vf.h | 2 +- - drivers/net/ixgbe/base/ixgbe_x540.c | 2 +- - drivers/net/ixgbe/base/ixgbe_x540.h | 2 +- - drivers/net/ixgbe/base/ixgbe_x550.c | 2 +- - drivers/net/ixgbe/base/ixgbe_x550.h | 2 +- - drivers/net/ixgbe/base/meson.build | 2 +- - 30 files changed, 30 insertions(+), 30 deletions(-) + drivers/net/ixgbe/base/README | 34 +++--------------------- + drivers/net/ixgbe/base/ixgbe_82598.c | 2 +- + drivers/net/ixgbe/base/ixgbe_82598.h | 2 +- + drivers/net/ixgbe/base/ixgbe_82599.c | 2 +- + drivers/net/ixgbe/base/ixgbe_82599.h | 2 +- + drivers/net/ixgbe/base/ixgbe_api.c | 2 +- + drivers/net/ixgbe/base/ixgbe_api.h | 2 +- + drivers/net/ixgbe/base/ixgbe_common.c | 2 +- + drivers/net/ixgbe/base/ixgbe_common.h | 2 +- + drivers/net/ixgbe/base/ixgbe_dcb.c | 2 +- + drivers/net/ixgbe/base/ixgbe_dcb.h | 2 +- + drivers/net/ixgbe/base/ixgbe_dcb_82598.c | 2 +- + drivers/net/ixgbe/base/ixgbe_dcb_82598.h | 2 +- + drivers/net/ixgbe/base/ixgbe_dcb_82599.c | 2 +- + drivers/net/ixgbe/base/ixgbe_dcb_82599.h | 2 +- + drivers/net/ixgbe/base/ixgbe_hv_vf.c | 2 +- + drivers/net/ixgbe/base/ixgbe_hv_vf.h | 2 +- + drivers/net/ixgbe/base/ixgbe_mbx.c | 2 +- + drivers/net/ixgbe/base/ixgbe_mbx.h | 2 +- + drivers/net/ixgbe/base/ixgbe_osdep.h | 2 +- + drivers/net/ixgbe/base/ixgbe_phy.c | 2 +- + drivers/net/ixgbe/base/ixgbe_phy.h | 2 +- + drivers/net/ixgbe/base/ixgbe_type.h | 2 +- + drivers/net/ixgbe/base/ixgbe_vf.c | 2 +- + drivers/net/ixgbe/base/ixgbe_vf.h | 2 +- + drivers/net/ixgbe/base/ixgbe_x540.c | 2 +- + drivers/net/ixgbe/base/ixgbe_x540.h | 2 +- + drivers/net/ixgbe/base/ixgbe_x550.c | 2 +- + drivers/net/ixgbe/base/ixgbe_x550.h | 2 +- + drivers/net/ixgbe/base/meson.build | 2 +- + 30 files changed, 32 insertions(+), 60 deletions(-) @@ -47 +48 @@ -index b6b420e2f3..a48b14ed27 100644 +index 431be0260e..a48b14ed27 100644 @@ -50,3 +51,33 @@ -@@ -1,4 +1,4 @@ - /* SPDX-License-Identifier: BSD-3-Clause -- * Copyright(c) 2010-2018 Intel Corporation +@@ -1,33 +1,5 @@ +-.. +- BSD LICENSE +- +- Copyright(c) 2010-2018 Intel Corporation. All rights reserved. +- All rights reserved. +- +- Redistribution and use in source and binary forms, with or without +- modification, are permitted provided that the following conditions +- are met: +- +- * Redistributions of source code must retain the above copyright +- notice, this list of conditions and the following disclaimer. +- * Redistributions in binary form must reproduce the above copyright +- notice, this list of conditions and the following disclaimer in +- the documentation and/or other materials provided with the +- distribution. +- * Neither the name of Intel Corporation nor the names of its +- contributors may be used to endorse or promote products derived +- from this software without specific prior written permission. +- +- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++/* SPDX-License-Identifier: BSD-3-Clause @@ -54 +85 @@ - */ ++ */ @@ -55,0 +87 @@ + Intel® IXGBE driver @@ -237 +269 @@ -index 844d1701f5..dc712b7c02 100644 +index ea8dc1cbe5..a4eb71777c 100644 @@ -317 +349 @@ -index 930a61a20b..3de406fd35 100644 +index a920a146e7..f2c8e5425e 100644 @@ -337 +369 @@ -index da3887560d..48bbb86cb8 100644 +index 21ac64bf5c..e4807e59a5 100644