Message ID | 0adf1a0f6d75f51099cbc5576024da100f970ad3.1729795186.git.davthompson@nvidia.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XZFYs1yL0z1xxC for <incoming@patchwork.ozlabs.org>; Fri, 25 Oct 2024 05:58:41 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1t432V-0001TF-7l; Thu, 24 Oct 2024 18:58:31 +0000 Received: from mail-dm6nam10on2048.outbound.protection.outlook.com ([40.107.93.48] helo=NAM10-DM6-obe.outbound.protection.outlook.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <davthompson@nvidia.com>) id 1t432S-0001RI-IQ for kernel-team@lists.ubuntu.com; Thu, 24 Oct 2024 18:58:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mVkxB2/74qbwnVMZsruH50u5Q6AM7c7jZTfe3oO7t8eAuYHGDTqlKc0oSi0uWPlYxtgbc0tcL97clsq9+IC8BY8NS5qtkLbVrhJlzVTGEebnPPVtDO0BFcNeua+IBPUo+ez0scpJUQTgjdfBC4UpdWQrEgIotvSbKZUlFlYDOtKPysD9CTLfG02veRD1mLklUq6DlFlmopLiYrAaK4nKQvn9ycyXqTmSx1MF6c0aXqHX84Y/eZIrGyNg7QAjB2reau9LhGWTfMIwUE3Mb5PvfaflM05BAgblxZCHRb7lx4sm4j47unTNRACv4uhrNL4gvM8OK1eUTUOecomRfkYc5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ma1G+CtNxtI8UnrJduQYrhfZDVTvmGCoBmTSrlCWWGE=; b=hQbEr+BeWcpfKM+ZCbRtJPqfEvf7ak0C5Ggcz9RDc/yl3KBRIjj/jAKVhPj/jJL3Cucto7uZqEXOWvfTuUrLYwv9YwTMuGF4egdmibNXnXDgY5MofxTLyJh9UD3MShHNLt8MHPyETEN+Ji2sbzMs8ILMdspwmvPmnklbTKHsgFATnWtSx4kYe4K7HCUTXSVVO5TNhbeWgXVn4rBRi3YqvMpVHgcjoxxquuk4HY5zv/43o62v7AYzOKuGjPSEYe27HTsy8ZVhdBoQlq4YlHO5yzSph/wtvr9S+XIuCZmCJp8BzsR9J4rgvwdCkE2+FFXKZEppXUKnc0xgkGIkz+mVHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=lists.ubuntu.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) Received: from SJ0PR03CA0137.namprd03.prod.outlook.com (2603:10b6:a03:33c::22) by SJ1PR12MB6241.namprd12.prod.outlook.com (2603:10b6:a03:458::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.32; Thu, 24 Oct 2024 18:58:21 +0000 Received: from CO1PEPF000042AB.namprd03.prod.outlook.com (2603:10b6:a03:33c:cafe::45) by SJ0PR03CA0137.outlook.office365.com (2603:10b6:a03:33c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.17 via Frontend Transport; Thu, 24 Oct 2024 18:58:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000042AB.mail.protection.outlook.com (10.167.243.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.14 via Frontend Transport; Thu, 24 Oct 2024 18:58:20 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 24 Oct 2024 11:58:06 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 24 Oct 2024 11:58:05 -0700 Received: from vdi.nvidia.com (10.127.8.14) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Thu, 24 Oct 2024 11:58:05 -0700 From: David Thompson <davthompson@nvidia.com> To: <kernel-team@lists.ubuntu.com> Subject: [PATCH v1 2/6] Revert "UBUNTU: SAUCE: bluefield_edac: Update license and copyright info" Date: Thu, 24 Oct 2024 14:57:58 -0400 Message-ID: <0adf1a0f6d75f51099cbc5576024da100f970ad3.1729795186.git.davthompson@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <cover.1729795186.git.davthompson@nvidia.com> References: <cover.1729795186.git.davthompson@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042AB:EE_|SJ1PR12MB6241:EE_ X-MS-Office365-Filtering-Correlation-Id: 57ef3f51-14f4-40bb-bb79-08dcf45dd43d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: Wpr3SF/bh044qZyxMpaouFqGGLAMSzLHZsekiWvnZRCwhRXv8YUejyQqGGGUHwti/eSrB0vT0Lh4ZtnK/4hg1fi7EOYDqJsU64sXvOQP1ioJBxKvFflYIYbIBaJLCbgwC066HrNgsPKx7pqc2UFdQrjdiv+rrXQ556NQ4Hb6xVw/Gy8EavS8nZ7LufTl2U2wQvjqE3L7mnPpZjQq+eU342e/glSt0vEgNTOG1jXy2DW+jGr0dqBvDRQYj/9YAnEYbXEn1N2W17dVx86EiD4/Tz5SfZZG0z5U1UcYFYlmWLLmOkUFrM96oReXhHU3iGNYZdv/vkpMJNil2nrA2CLVExnXHia/AMC6eQ7XtMsDBcee/5GOWx7DSAG7VFP2jgYxXhx3QVxK6V3BqcppnjYSwaCzrw29p5WQBuBJ9dtw0VHGtX9RjNohGehIl0HShUN7CMvsIvRx46f9BHTAzoAFvClEQk6pQ+KXENxhbcC21XzDm3gA8guxk9lcIGQiMXb8cqgcUq9tPnnpzB3prXJm0il2HAdbH6qlCbNRpZBsAEQJTZRhEN/Y8HsL0Uk2V4visdpuBCgm8y5foXszRg38XFxuicFBtUDH7CE02j+yCblP1ktIrM8UCjCW9gruiYZ6/aVlG0ug+6tR5DJuqln4H+/P34yS+g0TLROfdNkx3t9NtL4sk7P+FXZ8fKKdzIxWLyi8it42xf2ZrRnVzcsbJtWfi9ncJfcsFCPxdM6FUXRM7wbPEubvV7PIj9UpKtMLUYBe4YgE5WBH2/deuVTeVvr6MwubUofhgzGDcLSQ8kosO7Vo6OBf6RzeTo8JK7zD8VxFR7mL1inxZWQRoeJKOhFx85dR9S+4GUS6nlivb1F+CAr/6vFOi4CwbsYeo7tMoGoEws6JQp41lVU9mTSUxGoJDDj3Mbsg+J+yfmH8fsNRuBGaajjbXIad8WK5zXfjuY2NXalMIeZJW07d+rZbaHjKqilaeEN1LWz+ZjnHLX0OH54oTnr3j9n671Ap2EUbXaCCvPf0ClPrWqBbkZF0EpI6wqJ15TvhlCHT2q66sjuyKO+2IdYnnq0OdLzHsrf63SWyd9oaK3L8lJ1LsxsTR3+KCQkAL3AnboLaHe+EXYNWrE06kVrBAvbXBvXc8i69V5Ehrc6zzTy8xy70XLxlAo0JfB2rRRFFDtif/pENt4pOLgPUwBzsxfSVRZIrYOg9GiNUGt21/RoKqyiQfwRIc2fm9zc0i5ZVwJuYPEvRpeGaij+cMHjg+4XS9nF8k+lGREPdYJxh1KIh88p8QPOGrdOg91rZ7CrwMs57KTGsvSv6dmVf6T0LrQlu4BsS0zUXJ5gZ6twyCOcoStVJs27+LVhx1vVVhBXpposqiE/K3RhZlgtB0ArxszANRICltcm0o5pK3F3iVPgNlFTIiU9xgA== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(36860700013)(1800799024)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2024 18:58:20.8312 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 57ef3f51-14f4-40bb-bb79-08dcf45dd43d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042AB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6241 Received-SPF: softfail client-ip=40.107.93.48; envelope-from=davthompson@nvidia.com; helo=NAM10-DM6-obe.outbound.protection.outlook.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Cc: shravankr@nvidia.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
bluefield_edac: replace SAUCE patches with upstream content
|
expand
|
diff --git a/drivers/edac/bluefield_edac.c b/drivers/edac/bluefield_edac.c index c21eb015f2d1..8e1127a5681c 100644 --- a/drivers/edac/bluefield_edac.c +++ b/drivers/edac/bluefield_edac.c @@ -1,8 +1,8 @@ -// SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0 /* * Bluefield-specific EDAC driver. * - * Copyright (c) 2022 NVIDIA Corporation. + * Copyright (c) 2019 Mellanox Technologies. */ #include <linux/acpi.h> @@ -492,5 +492,5 @@ static struct platform_driver bluefield_edac_mc_driver = { module_platform_driver(bluefield_edac_mc_driver); MODULE_DESCRIPTION("Mellanox BlueField memory edac driver"); -MODULE_AUTHOR("Shravan Kumar Ramani <shravankr@nvidia.com>"); -MODULE_LICENSE("Dual BSD/GPL"); +MODULE_AUTHOR("Mellanox Technologies"); +MODULE_LICENSE("GPL v2");
BugLink: https://bugs.launchpad.net/bugs/2085561 This reverts commit 19572d6d2ef59e606978e0e3ee5bb86fa523dd59. Signed-off-by: David Thompson <davthompson@nvidia.com> --- drivers/edac/bluefield_edac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)