From patchwork Fri May 12 10:06:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 681574 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB2E6C7EE2D for ; Fri, 12 May 2023 10:07:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240484AbjELKHN (ORCPT ); Fri, 12 May 2023 06:07:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240398AbjELKHC (ORCPT ); Fri, 12 May 2023 06:07:02 -0400 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6952106D3; Fri, 12 May 2023 03:07:00 -0700 (PDT) Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1aad55244b7so74826015ad.2; Fri, 12 May 2023 03:07:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683886020; x=1686478020; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BxUq3YLztp4DNVv6U1fiGgpx+oeOVzDyxQ2q0biTG8I=; b=iokr5EotZR7X6156ihWRt57IvPCSp1+PYgZ6QJm7abWEB0uyQEKcBneJ3R2VgLW9Ol DMJMsqNqMsBNwxbYvQxBbwXAlvcSAj7qXEJa3KPn8a2bqpWy+AhJ9rHouHWWqa1Zxr2z 7Fl34c5wTk18pR+a+vtjfj9gevV/cxNSz/iZ0bW17BZ9IW+SVCS4J+KmLFtH4MkboRwp ECRUxYVvGrEZTXXVgPRa7FD3imTANH1SzyMz/NXkIf6eMRT9IMf7inJ984Pz/6nX5GCL 5ddD8Gj9STUa5sz5A7pPEMRo404J3JVlVl/ta31FERe+QKlKrGOcvVBG4SebNlpPHung GOeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683886020; x=1686478020; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BxUq3YLztp4DNVv6U1fiGgpx+oeOVzDyxQ2q0biTG8I=; b=QF0WhfwNr++N2fBfggoLb4Kcjjs/tWkkMqH83hFGo0PWqG6GG8XOulCDvfAvYlM1aR XGamvxmqcSEsrSeyz3AaZPj3b7igK06sRg+2zN/tnipTuh2e/7PHByHE+dxqQI5HeLrn 5cpk9roYgJP0Ml3wGVYFtfE2OFcWd2YNRm5lHP0n7ZxgkFCvbkNTwroHwNVzsxOi00AQ 2vqz7B6I7SU/VGYQsLgcblOF3Ew0P+9xOgefDn0vGpFozGYWA3/DNXxW4J7veUH5y4AK WZcvki0vhltAzBVkXhqJsekETP0FnfAd71xQt1eEHwqMQNCrYbNQf2AeFhmsMvOxOD51 7zQQ== X-Gm-Message-State: AC+VfDy2L2hXw4fcUReA70Pyogz9w9jU98ujiF1bba0PSIUIFI4om5Rr lP3GShmgsPSI3JMg8IcfuAc= X-Google-Smtp-Source: ACHHUZ5nuYpORXz/tLJ7HmMn2eHynj5Vltbgetp2+KQtQQOg6FDcgPx4N0/5dvslRAVwDR20eMRnTw== X-Received: by 2002:a17:903:1205:b0:1ac:6d4c:c26a with SMTP id l5-20020a170903120500b001ac6d4cc26amr22313546plh.14.1683886020200; Fri, 12 May 2023 03:07:00 -0700 (PDT) Received: from debian.me (subs28-116-206-12-58.three.co.id. [116.206.12.58]) by smtp.gmail.com with ESMTPSA id l9-20020a170903244900b001ac94b33ab1sm7532231pls.304.2023.05.12.03.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 03:06:59 -0700 (PDT) Received: by debian.me (Postfix, from userid 1000) id 2C9D8106B33; Fri, 12 May 2023 17:06:54 +0700 (WIB) From: Bagas Sanjaya To: Linux SPDX Licenses , Linux DRI Development , Linux Kernel Mailing List , Linux Networking , Linux ARM , Linux Staging Drivers , Linux Watchdog Devices , Linux Kernel Actions Cc: Diederik de Haas , Kate Stewart , Philippe Ombredanne , Thomas Gleixner , David Airlie , Karsten Keil , Jay Vosburgh , Andy Gospodarek , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Sam Creasey , Dominik Brodowski , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Greg Kroah-Hartman , Wim Van Sebroeck , Guenter Roeck , Jan Kara , =?utf-8?q?And?= =?utf-8?q?reas_F=C3=A4rber?= , Manivannan Sadhasivam , Bagas Sanjaya , Thomas Davis , Christophe JAILLET , Stephen Hemminger , Simon Horman Subject: [PATCH v2 03/10] net: bonding: Add SPDX identifier to remaining files Date: Fri, 12 May 2023 17:06:14 +0700 Message-Id: <20230512100620.36807-4-bagasdotme@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230512100620.36807-1-bagasdotme@gmail.com> References: <20230512100620.36807-1-bagasdotme@gmail.com> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2509; i=bagasdotme@gmail.com; h=from:subject; bh=JdLGTV+zXI78x437QouL/kFbLmtamk90mD7K+ie5nOI=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDClx/NPDL6jtPbSzO6X4WNVdToVPYa2PdRSmbJC6//w2+ 5byoIu2HaUsDGJcDLJiiiyTEvmaTu8yErnQvtYRZg4rE8gQBi5OAZjIm8sM//R+zjG+xSk69VVW Y/Yk3UtLEksMDOLOnmVtWn5tL5uJ+lSG/zn/wmNaI86zz5uoXZDXHSkar9OScOoRw6+Xr2r/CSt c5AcA X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Previous batches of SPDX conversion missed bond_main.c and bonding_priv.h because these files doesn't mention intended GPL version. Add SPDX identifier to these files, assuming GPL 1.0+. Cc: Thomas Davis Cc: Christophe JAILLET Cc: Stephen Hemminger Reviewed-by: Simon Horman Signed-off-by: Bagas Sanjaya --- drivers/net/bonding/bond_main.c | 3 ++- drivers/net/bonding/bonding_priv.h | 4 +--- include/net/bonding.h | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 3fed888629f7b5..73059bff425729 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1,8 +1,9 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * originally based on the dummy device. * * Copyright 1999, Thomas Davis, tadavis@lbl.gov. - * Licensed under the GPL. Based on dummy.c, and eql.c devices. + * Based on dummy.c, and eql.c devices. * * bonding.c: an Ethernet Bonding driver * diff --git a/drivers/net/bonding/bonding_priv.h b/drivers/net/bonding/bonding_priv.h index 48cdf3a49a7d74..fef6288c6944fb 100644 --- a/drivers/net/bonding/bonding_priv.h +++ b/drivers/net/bonding/bonding_priv.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-1.0+ */ /* * Bond several ethernet interfaces into a Cisco, running 'Etherchannel'. * @@ -7,9 +8,6 @@ * BUT, I'm the one who modified it for ethernet, so: * (c) Copyright 1999, Thomas Davis, tadavis@lbl.gov * - * This software may be used and distributed according to the terms - * of the GNU Public License, incorporated herein by reference. - * */ #ifndef _BONDING_PRIV_H diff --git a/include/net/bonding.h b/include/net/bonding.h index a60a24923b5599..50dfc9b939ecb7 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-1.0+ */ /* * Bond several ethernet interfaces into a Cisco, running 'Etherchannel'. * @@ -7,9 +8,6 @@ * BUT, I'm the one who modified it for ethernet, so: * (c) Copyright 1999, Thomas Davis, tadavis@lbl.gov * - * This software may be used and distributed according to the terms - * of the GNU Public License, incorporated herein by reference. - * */ #ifndef _NET_BONDING_H From patchwork Fri May 12 10:06:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 681573 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D81EDC7EE32 for ; Fri, 12 May 2023 10:07:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240013AbjELKHP (ORCPT ); Fri, 12 May 2023 06:07:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240437AbjELKHE (ORCPT ); Fri, 12 May 2023 06:07:04 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 339D119BE; Fri, 12 May 2023 03:07:02 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-64a9335a8e7so4469399b3a.0; Fri, 12 May 2023 03:07:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683886021; x=1686478021; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4KIpv4WltxOX2Z/4nLCGiCrEW99+slO6rQFVOFj9jCM=; b=puurPWhhvbxp0nMkmfMrx/ZJHuGf+p4ENUA03qKwcBIg21G62RM+E50o8mmxp4Dtcp rwZnfW5sQsZM6Aa7m2ikwNxuOTuI0pdOyhq/34Xwxg8u8qMaudveTvPYJOqShCgA9WoR WS2XWB9fhgomedNGGzPhy8hZTQMbHUQVliNDqM17J3pzq/g9EAnLgEnw76cg0TfCJnAF L9gPf6m8KlLdzFEb4fyVngC139y4KIPF2x5Gf3iMN3rGanH99lXvA5HIh83AlmWkSQtD 9haDzk3X+d2SEiwX0Uz+Xx7TDdIr8fs2+vdSXnS/WvXgv50dHpn25tYgJXhem2rkcRbH xJag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683886021; x=1686478021; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4KIpv4WltxOX2Z/4nLCGiCrEW99+slO6rQFVOFj9jCM=; b=e5tZAWxZmUNhVN3696oHWpTwqUSyXUz0DPHWi4OjG7lBZDsOe8fEFNYBslk0W3cswc LlQMF4FddeLqOIVcnbS1BhZbecb7R+MqQxTO7hwQElwwoHMmkH2Wdf4RKIpAscwpzwyC gTv/Ph2v26HPPZBti9AptZlJzCgHzfWVWKpJDImct6AsEStT1R45L2QcUPrZq0C6mvNS 98vWhrrn5Q0VVSWX6MJn+oaQEvZF2xil56nDMzDiJUNasUy1Vkk0uPAtpovsrb37whft fqviIXI1pmkuyyhpWgHLU6QIPQb6dRtz/Qkv+MqePQgCcHdqMT4Urzr/p6krWaKKrf/K ds5g== X-Gm-Message-State: AC+VfDxP197UiyTLoH9Nr5lib6BAmkx0CGUmsP14OkUj8aK3AFrEtvfa urKTvsD9CyVXasQhEGVvY+E= X-Google-Smtp-Source: ACHHUZ4J/D/M6jg7AiPgJwjC+cB0O+qBsGQ6CE1m/1OAOemMhNrXsreGHuFd+auJae3YGNdT9NjvnQ== X-Received: by 2002:a05:6a00:3318:b0:63d:368c:97c2 with SMTP id cq24-20020a056a00331800b0063d368c97c2mr34175864pfb.8.1683886021097; Fri, 12 May 2023 03:07:01 -0700 (PDT) Received: from debian.me (subs28-116-206-12-58.three.co.id. [116.206.12.58]) by smtp.gmail.com with ESMTPSA id u19-20020aa78393000000b006242f4a8945sm6703481pfm.182.2023.05.12.03.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 03:06:59 -0700 (PDT) Received: by debian.me (Postfix, from userid 1000) id 52FF2106B34; Fri, 12 May 2023 17:06:54 +0700 (WIB) From: Bagas Sanjaya To: Linux SPDX Licenses , Linux DRI Development , Linux Kernel Mailing List , Linux Networking , Linux ARM , Linux Staging Drivers , Linux Watchdog Devices , Linux Kernel Actions Cc: Diederik de Haas , Kate Stewart , Philippe Ombredanne , Thomas Gleixner , David Airlie , Karsten Keil , Jay Vosburgh , Andy Gospodarek , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Sam Creasey , Dominik Brodowski , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Greg Kroah-Hartman , Wim Van Sebroeck , Guenter Roeck , Jan Kara , =?utf-8?q?And?= =?utf-8?q?reas_F=C3=A4rber?= , Manivannan Sadhasivam , Bagas Sanjaya , "David A . Hinds" , Donald Becker , Peter De Schrijver , Topi Kanerva , Alain Malek , Bruce Abbott , Alan Cox , Greg Ungerer , Simon Horman Subject: [PATCH v2 04/10] net: ethernet: 8390: Replace GPL boilerplate with SPDX identifier Date: Fri, 12 May 2023 17:06:15 +0700 Message-Id: <20230512100620.36807-5-bagasdotme@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230512100620.36807-1-bagasdotme@gmail.com> References: <20230512100620.36807-1-bagasdotme@gmail.com> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=12269; i=bagasdotme@gmail.com; h=from:subject; bh=InmDovYJY2agWe7gpR1Z4FTdo82Q9Yqm+WaEZzImljM=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDClx/NNtf7/4wPm06oxprKRPgf+K4gjFL6nv9aZHNHpzv Fyhr3aoo5SFQYyLQVZMkWVSIl/T6V1GIhfa1zrCzGFlAhnCwMUpABPJesvI8PTEQiMG1m2W2+zP nne/KGBTcSxeaN5n8Ssbz0wVm3tu7gJGhml9UWwTy868WMF96fP8H8kvi6bMOxDiNdlHhbXlcIP QJn4A X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Replace GPL boilerplate notice on remaining files with appropriate SPDX tag. For files mentioning COPYING, use GPL 2.0; otherwise GPL 1.0+. Cc: David A. Hinds Cc: Donald Becker Cc: Peter De Schrijver Cc: Topi Kanerva Cc: Alain Malek Cc: Bruce Abbott Cc: Alan Cox Acked-by: Greg Ungerer Reviewed-by: Simon Horman Signed-off-by: Bagas Sanjaya --- drivers/net/ethernet/8390/8390.h | 2 ++ drivers/net/ethernet/8390/apne.c | 7 +------ drivers/net/ethernet/8390/axnet_cs.c | 6 +++--- drivers/net/ethernet/8390/hydra.c | 6 ++---- drivers/net/ethernet/8390/lib8390.c | 5 ++--- drivers/net/ethernet/8390/mac8390.c | 6 ++---- drivers/net/ethernet/8390/mcf8390.c | 4 +--- drivers/net/ethernet/8390/ne.c | 4 +--- drivers/net/ethernet/8390/ne2k-pci.c | 8 +------- drivers/net/ethernet/8390/pcnet_cs.c | 5 ++--- drivers/net/ethernet/8390/smc-ultra.c | 4 +--- drivers/net/ethernet/8390/stnic.c | 5 +---- drivers/net/ethernet/8390/wd.c | 4 +--- drivers/net/ethernet/8390/zorro8390.c | 7 +------ 14 files changed, 21 insertions(+), 52 deletions(-) diff --git a/drivers/net/ethernet/8390/8390.h b/drivers/net/ethernet/8390/8390.h index e5226446599884..f784a6e2ab0ed3 100644 --- a/drivers/net/ethernet/8390/8390.h +++ b/drivers/net/ethernet/8390/8390.h @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: GPL-1.0+ */ + /* Generic NS8390 register definitions. */ /* This file is part of Donald Becker's 8390 drivers, and is distributed diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c index 991ad953aa7906..bf9a95875b0b20 100644 --- a/drivers/net/ethernet/8390/apne.c +++ b/drivers/net/ethernet/8390/apne.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * Amiga Linux/68k 8390 based PCMCIA Ethernet Driver for the Amiga 1200 * @@ -19,12 +20,6 @@ * * ---------------------------------------------------------------------------- * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of the Linux - * distribution for more details. - * - * ---------------------------------------------------------------------------- - * */ diff --git a/drivers/net/ethernet/8390/axnet_cs.c b/drivers/net/ethernet/8390/axnet_cs.c index 78f985885547ea..fea489af72fb0b 100644 --- a/drivers/net/ethernet/8390/axnet_cs.c +++ b/drivers/net/ethernet/8390/axnet_cs.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-1.0+ + /*====================================================================== A PCMCIA ethernet driver for Asix AX88190-based cards @@ -17,9 +19,7 @@ Written 1992,1993 by Donald Becker. Copyright 1993 United States Government as represented by the - Director, National Security Agency. This software may be used and - distributed according to the terms of the GNU General Public License, - incorporated herein by reference. + Director, National Security Agency. Donald Becker may be reached at becker@scyld.com ======================================================================*/ diff --git a/drivers/net/ethernet/8390/hydra.c b/drivers/net/ethernet/8390/hydra.c index 1df7601af86a40..1c3dd9a2847543 100644 --- a/drivers/net/ethernet/8390/hydra.c +++ b/drivers/net/ethernet/8390/hydra.c @@ -1,10 +1,8 @@ +// SPDX-License-Identifier: GPL-1.0+ + /* New Hydra driver using generic 8390 core */ /* Based on old hydra driver by Topi Kanerva (topi@susanna.oulu.fi) */ -/* This file is subject to the terms and conditions of the GNU General */ -/* Public License. See the file COPYING in the main directory of the */ -/* Linux distribution for more details. */ - /* Peter De Schrijver (p2@mind.be) */ /* Oldenburg 2000 */ diff --git a/drivers/net/ethernet/8390/lib8390.c b/drivers/net/ethernet/8390/lib8390.c index e84021282edf30..84aeb8054304f9 100644 --- a/drivers/net/ethernet/8390/lib8390.c +++ b/drivers/net/ethernet/8390/lib8390.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-1.0+ + /* 8390.c: A general NS8390 ethernet driver core for linux. */ /* Written 1992-94 by Donald Becker. @@ -5,9 +7,6 @@ Copyright 1993 United States Government as represented by the Director, National Security Agency. - This software may be used and distributed according to the terms - of the GNU General Public License, incorporated herein by reference. - The author may be reached as becker@scyld.com, or C/O Scyld Computing Corporation 410 Severn Ave., Suite 210 diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c index 7fb819b9b89a5b..4a0a095a1a8a0a 100644 --- a/drivers/net/ethernet/8390/mac8390.c +++ b/drivers/net/ethernet/8390/mac8390.c @@ -1,11 +1,9 @@ +// SPDX-License-Identifier: GPL-1.0+ /* mac8390.c: New driver for 8390-based Nubus (or Nubus-alike) Ethernet cards on Linux */ /* Based on the former daynaport.c driver, by Alan Cox. Some code taken from or inspired by skeleton.c by Donald Becker, acenic.c by - Jes Sorensen, and ne2k-pci.c by Donald Becker and Paul Gortmaker. - - This software may be used and distributed according to the terms of - the GNU Public License, incorporated herein by reference. */ + Jes Sorensen, and ne2k-pci.c by Donald Becker and Paul Gortmaker. */ /* 2000-02-28: support added for Dayna and Kinetics cards by A.G.deWijn@phys.uu.nl */ diff --git a/drivers/net/ethernet/8390/mcf8390.c b/drivers/net/ethernet/8390/mcf8390.c index 8a7918d3341965..217838b2822025 100644 --- a/drivers/net/ethernet/8390/mcf8390.c +++ b/drivers/net/ethernet/8390/mcf8390.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Support for ColdFire CPU based boards using a NS8390 Ethernet device. * @@ -5,9 +6,6 @@ * * (C) Copyright 2012, Greg Ungerer * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of the Linux - * distribution for more details. */ #include diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c index 0a9118b8be0c64..cb04a3071f92d4 100644 --- a/drivers/net/ethernet/8390/ne.c +++ b/drivers/net/ethernet/8390/ne.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* ne.c: A general non-shared-memory NS8390 ethernet driver for linux. */ /* Written 1992-94 by Donald Becker. @@ -5,9 +6,6 @@ Copyright 1993 United States Government as represented by the Director, National Security Agency. - This software may be used and distributed according to the terms - of the GNU General Public License, incorporated herein by reference. - The author may be reached as becker@scyld.com, or C/O Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403 diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c index 6a0a2039600a0a..ea3488e81c5f3c 100644 --- a/drivers/net/ethernet/8390/ne2k-pci.c +++ b/drivers/net/ethernet/8390/ne2k-pci.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* A Linux device driver for PCI NE2000 clones. * * Authors and other copyright holders: @@ -6,13 +7,6 @@ * Copyright 1993 assigned to the United States Government as represented * by the Director, National Security Agency. * - * This software may be used and distributed according to the terms of - * the GNU General Public License (GPL), incorporated herein by reference. - * Drivers based on or derived from this code fall under the GPL and must - * retain the authorship, copyright and license notice. This file is not - * a complete program and may only be used when the entire operating - * system is licensed under the GPL. - * * The author may be reached as becker@scyld.com, or C/O * Scyld Computing Corporation * 410 Severn Ave., Suite 210 diff --git a/drivers/net/ethernet/8390/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c index 0f07fe03da98c8..9bd5e991f1e52b 100644 --- a/drivers/net/ethernet/8390/pcnet_cs.c +++ b/drivers/net/ethernet/8390/pcnet_cs.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /*====================================================================== A PCMCIA ethernet driver for NS8390-based cards @@ -17,9 +18,7 @@ Written 1992,1993 by Donald Becker. Copyright 1993 United States Government as represented by the - Director, National Security Agency. This software may be used and - distributed according to the terms of the GNU General Public License, - incorporated herein by reference. + Director, National Security Agency. Donald Becker may be reached at becker@scyld.com Based also on Keith Moore's changes to Don Becker's code, for IBM diff --git a/drivers/net/ethernet/8390/smc-ultra.c b/drivers/net/ethernet/8390/smc-ultra.c index 6e62c37c940056..ae10b7de41e8f1 100644 --- a/drivers/net/ethernet/8390/smc-ultra.c +++ b/drivers/net/ethernet/8390/smc-ultra.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* smc-ultra.c: A SMC Ultra ethernet driver for linux. */ /* This is a driver for the SMC Ultra and SMC EtherEZ ISA ethercards. @@ -7,9 +8,6 @@ Copyright 1993 United States Government as represented by the Director, National Security Agency. - This software may be used and distributed according to the terms - of the GNU General Public License, incorporated herein by reference. - The author may be reached as becker@scyld.com, or C/O Scyld Computing Corporation 410 Severn Ave., Suite 210 diff --git a/drivers/net/ethernet/8390/stnic.c b/drivers/net/ethernet/8390/stnic.c index bd89ca8a92dfbc..265976e3b64ab2 100644 --- a/drivers/net/ethernet/8390/stnic.c +++ b/drivers/net/ethernet/8390/stnic.c @@ -1,8 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-only /* stnic.c : A SH7750 specific part of driver for NS DP83902A ST-NIC. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. * * Copyright (C) 1999 kaz Kojima */ diff --git a/drivers/net/ethernet/8390/wd.c b/drivers/net/ethernet/8390/wd.c index 5b00c452bede64..9a36667d00b65c 100644 --- a/drivers/net/ethernet/8390/wd.c +++ b/drivers/net/ethernet/8390/wd.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-1.0+ /* wd.c: A WD80x3 ethernet driver for linux. */ /* Written 1993-94 by Donald Becker. @@ -5,9 +6,6 @@ Copyright 1993 United States Government as represented by the Director, National Security Agency. - This software may be used and distributed according to the terms - of the GNU General Public License, incorporated herein by reference. - The author may be reached as becker@scyld.com, or C/O Scyld Computing Corporation 410 Severn Ave., Suite 210 diff --git a/drivers/net/ethernet/8390/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c index e8b4fe813a0828..d70390e9d03d9b 100644 --- a/drivers/net/ethernet/8390/zorro8390.c +++ b/drivers/net/ethernet/8390/zorro8390.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Amiga Linux/m68k and Linux/PPC Zorro NS8390 Ethernet Driver * @@ -9,12 +10,6 @@ * * --------------------------------------------------------------------------- * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of the Linux - * distribution for more details. - * - * --------------------------------------------------------------------------- - * * The Ariadne II and X-Surf are Zorro-II boards containing Realtek RTL8019AS * Ethernet Controllers. */ From patchwork Fri May 12 10:06:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 681571 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C05FBC7EE2D for ; Fri, 12 May 2023 10:07:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240615AbjELKHR (ORCPT ); Fri, 12 May 2023 06:07:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233460AbjELKHJ (ORCPT ); Fri, 12 May 2023 06:07:09 -0400 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BE156A67; Fri, 12 May 2023 03:07:04 -0700 (PDT) Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-643b7b8f8ceso5229311b3a.1; Fri, 12 May 2023 03:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683886023; x=1686478023; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hLwt+CeOi+feKhP3mxJBkHvUBLpCwmKqo12nuDQlmGI=; b=qgyxmQu4AqzenRnGSj2QJapIczPViuUs3eDEvRgPLsQq6KcC9RPEEiNYaOWYX6VuSH HVb7RublizUABGOViGtjrD5WF0xoTgRug81+djSEWQMzGmP0sm3RJQLL7I6O1fjgdhj6 ThGA1iaips6fsvC17PSmA+qu1QL8dUIUlVqqTEM+o1LTdJUqUdn+X84+TgL9nf3Mmbc7 3aWVVTem3u91zRau+28yZyOlUSbdWNFPPny4PchQ03TCU3kIei8wsAqxxYJxw7IbH1PR qXU7kg4x655r4cEYsl4hqicvR63aTM4yxeMl6qtXJl99t0h3M3SsAwXzGLawRP2b4X4y svFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683886023; x=1686478023; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hLwt+CeOi+feKhP3mxJBkHvUBLpCwmKqo12nuDQlmGI=; b=HJtgZAtp0mi4XNhdZZUnxQmD7mhK4+Z7DDpDyfRBNEZWjcOwZm6ye2u+pp+O6LTIgD m8J4/9rqZP025P/0Flkt9HL+XmMunITMTUFEPyp4f0iqH2ca6Sxw4A8l1juV5j0TC8fx FUL9i3t6vpHhs6ICyOwQCrrRNQOrw16FNy/mRV5AgHDUo7Gk038p92e7d1bVDScu0Wqs NDKT4FWBk3o2+AuYIaH06DDz1QL8GWlc3xh8h1qZuwthS6QgTMf1kN5vnUt0NOzk3T+N wLH9jXQxpCt3IqeLun5aj5AH36LrwInwSmcrNg177j7QSpWyJu3sja35sBk7OhvBaDiJ 8gxw== X-Gm-Message-State: AC+VfDwNAHWPW5XFcPAjzh7ZNhSyj4ul8RlRDlO46irqQQQHovd2VfoG ZAXGfMGbdAZKZ2Mq96GCV7Y= X-Google-Smtp-Source: ACHHUZ6Sp8tsGaI+fnUKzA6eZvWlfSweSeEvTzWl5Fskx8nhQ74cWrmbE1ra7yOUWC92rkJZwj6nDA== X-Received: by 2002:a05:6a20:3d16:b0:101:5ef3:1a02 with SMTP id y22-20020a056a203d1600b001015ef31a02mr14868433pzi.7.1683886023329; Fri, 12 May 2023 03:07:03 -0700 (PDT) Received: from debian.me (subs28-116-206-12-58.three.co.id. [116.206.12.58]) by smtp.gmail.com with ESMTPSA id j20-20020aa78d14000000b0063d375ca0cbsm6685664pfe.151.2023.05.12.03.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 03:07:02 -0700 (PDT) Received: by debian.me (Postfix, from userid 1000) id D3A51106B41; Fri, 12 May 2023 17:06:55 +0700 (WIB) From: Bagas Sanjaya To: Linux SPDX Licenses , Linux DRI Development , Linux Kernel Mailing List , Linux Networking , Linux ARM , Linux Staging Drivers , Linux Watchdog Devices , Linux Kernel Actions Cc: Diederik de Haas , Kate Stewart , Philippe Ombredanne , Thomas Gleixner , David Airlie , Karsten Keil , Jay Vosburgh , Andy Gospodarek , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Sam Creasey , Dominik Brodowski , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Greg Kroah-Hartman , Wim Van Sebroeck , Guenter Roeck , Jan Kara , =?utf-8?q?And?= =?utf-8?q?reas_F=C3=A4rber?= , Manivannan Sadhasivam , Bagas Sanjaya , Maxime Bizon , "David A . Hinds" , "John G . Dorsey" , Simon Horman Subject: [PATCH v2 06/10] pcmcia: Add SPDX identifier Date: Fri, 12 May 2023 17:06:17 +0700 Message-Id: <20230512100620.36807-7-bagasdotme@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230512100620.36807-1-bagasdotme@gmail.com> References: <20230512100620.36807-1-bagasdotme@gmail.com> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=28406; i=bagasdotme@gmail.com; h=from:subject; bh=KNBVlfWKS31v1GfrqNdl9eVn/phaf57sc0J+WugtBcg=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDClx/DPW7zzzQpvt1f4XAvMLzM0eyl/KZVHdpGxxi8fnv /C99KeOHaUsDGJcDLJiiiyTEvmaTu8yErnQvtYRZg4rE8gQBi5OAZiIZwDDPzOVT8c0d8i9ud+/ eMbGGc3KC35PPnl7XnHRjK6EDxlB2zoYGX4o/Smxjfm8eQv3X3kO+Y2BrlyzVsw6mr1YZNfC+Gs SOswA X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Add SPDX identifier on remaining files untouched during previous rounds of SPDX conversion while replacing boilerplate notice if any. Cc: Maxime Bizon Cc: David A. Hinds Cc: John G. Dorsey Reviewed-by: Simon Horman Signed-off-by: Bagas Sanjaya --- drivers/pcmcia/bcm63xx_pcmcia.c | 5 +---- drivers/pcmcia/cirrus.h | 21 +-------------------- drivers/pcmcia/i82365.c | 22 +--------------------- drivers/pcmcia/i82365.h | 21 +-------------------- drivers/pcmcia/o2micro.h | 21 +-------------------- drivers/pcmcia/pd6729.c | 3 +-- drivers/pcmcia/pxa2xx_base.h | 1 + drivers/pcmcia/ricoh.h | 21 +-------------------- drivers/pcmcia/sa1100_generic.c | 22 +--------------------- drivers/pcmcia/sa11xx_base.c | 22 +--------------------- drivers/pcmcia/sa11xx_base.h | 22 +--------------------- drivers/pcmcia/soc_common.c | 22 +--------------------- drivers/pcmcia/tcic.c | 22 +--------------------- drivers/pcmcia/tcic.h | 21 +-------------------- drivers/pcmcia/ti113x.h | 21 +-------------------- drivers/pcmcia/topic.h | 23 +---------------------- drivers/pcmcia/vg468.h | 21 +-------------------- 17 files changed, 17 insertions(+), 294 deletions(-) diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c index dd3c2609904877..0564bcabf85dc9 100644 --- a/drivers/pcmcia/bcm63xx_pcmcia.c +++ b/drivers/pcmcia/bcm63xx_pcmcia.c @@ -1,8 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-only /* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * * Copyright (C) 2008 Maxime Bizon */ diff --git a/drivers/pcmcia/cirrus.h b/drivers/pcmcia/cirrus.h index 446a4576e73e6c..8d3a256c97a087 100644 --- a/drivers/pcmcia/cirrus.h +++ b/drivers/pcmcia/cirrus.h @@ -1,30 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * cirrus.h 1.4 1999/10/25 20:03:34 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. */ #ifndef _LINUX_CIRRUS_H diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c index 891ccea2cccb0a..a7b50c7201215f 100644 --- a/drivers/pcmcia/i82365.c +++ b/drivers/pcmcia/i82365.c @@ -1,34 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 /*====================================================================== Device driver for Intel 82365 and compatible PC Card controllers. i82365.c 1.265 1999/11/10 18:36:21 - The contents of this file are subject to the Mozilla Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. - The initial developer of the original code is David A. Hinds . Portions created by David A. Hinds are Copyright (C) 1999 David A. Hinds. All Rights Reserved. - Alternatively, the contents of this file may be used under the - terms of the GNU General Public License version 2 (the "GPL"), in which - case the provisions of the GPL are applicable instead of the - above. If you wish to allow the use of your version of this file - only under the terms of the GPL and not to allow others to use - your version of this file under the MPL, indicate your decision - by deleting the provisions above and replace them with the notice - and other provisions required by the GPL. If you do not delete - the provisions above, a recipient may use your version of this - file under either the MPL or the GPL. - ======================================================================*/ #include diff --git a/drivers/pcmcia/i82365.h b/drivers/pcmcia/i82365.h index 3f84d7a2dc84fa..5501001c7dd8ab 100644 --- a/drivers/pcmcia/i82365.h +++ b/drivers/pcmcia/i82365.h @@ -1,30 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * i82365.h 1.15 1999/10/25 20:03:34 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. */ #ifndef _LINUX_I82365_H diff --git a/drivers/pcmcia/o2micro.h b/drivers/pcmcia/o2micro.h index 5096e92c7a4cfb..8b828c0932950c 100644 --- a/drivers/pcmcia/o2micro.h +++ b/drivers/pcmcia/o2micro.h @@ -1,30 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * o2micro.h 1.13 1999/10/25 20:03:34 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. */ #ifndef _LINUX_O2MICRO_H diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index a0a2e7f18356c5..d6a28fa6da840b 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-1.0+ /* * Driver for the Cirrus PD6729 PCI-PCMCIA bridge. * * Based on the i82092.c driver. * - * This software may be used and distributed according to the terms of - * the GNU General Public License, incorporated herein by reference. */ #include diff --git a/drivers/pcmcia/pxa2xx_base.h b/drivers/pcmcia/pxa2xx_base.h index e58c7a41541880..9583d08983f5cd 100644 --- a/drivers/pcmcia/pxa2xx_base.h +++ b/drivers/pcmcia/pxa2xx_base.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ int pxa2xx_drv_pcmcia_add_one(struct soc_pcmcia_socket *skt); void pxa2xx_drv_pcmcia_ops(struct pcmcia_low_level *ops); void pxa2xx_configure_sockets(struct device *dev, struct pcmcia_low_level *ops); diff --git a/drivers/pcmcia/ricoh.h b/drivers/pcmcia/ricoh.h index 8ac7b138c09486..f037169f6108f7 100644 --- a/drivers/pcmcia/ricoh.h +++ b/drivers/pcmcia/ricoh.h @@ -1,30 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * ricoh.h 1.9 1999/10/25 20:03:34 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. */ #ifndef _LINUX_RICOH_H diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c index 89d4ba58c89135..9ec190ab29a89e 100644 --- a/drivers/pcmcia/sa1100_generic.c +++ b/drivers/pcmcia/sa1100_generic.c @@ -1,33 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 /*====================================================================== Device driver for the PCMCIA control functionality of StrongARM SA-1100 microprocessors. - The contents of this file are subject to the Mozilla Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. - The initial developer of the original code is John G. Dorsey . Portions created by John G. Dorsey are Copyright (C) 1999 John G. Dorsey. All Rights Reserved. - Alternatively, the contents of this file may be used under the - terms of the GNU Public License version 2 (the "GPL"), in which - case the provisions of the GPL are applicable instead of the - above. If you wish to allow the use of your version of this file - only under the terms of the GPL and not to allow others to use - your version of this file under the MPL, indicate your decision - by deleting the provisions above and replace them with the notice - and other provisions required by the GPL. If you do not delete - the provisions above, a recipient may use your version of this - file under either the MPL or the GPL. - ======================================================================*/ #include diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c index 48140ac73ed632..3e9b3b0c9b0817 100644 --- a/drivers/pcmcia/sa11xx_base.c +++ b/drivers/pcmcia/sa11xx_base.c @@ -1,33 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 /*====================================================================== Device driver for the PCMCIA control functionality of StrongARM SA-1100 microprocessors. - The contents of this file are subject to the Mozilla Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. - The initial developer of the original code is John G. Dorsey . Portions created by John G. Dorsey are Copyright (C) 1999 John G. Dorsey. All Rights Reserved. - Alternatively, the contents of this file may be used under the - terms of the GNU Public License version 2 (the "GPL"), in which - case the provisions of the GPL are applicable instead of the - above. If you wish to allow the use of your version of this file - only under the terms of the GPL and not to allow others to use - your version of this file under the MPL, indicate your decision - by deleting the provisions above and replace them with the notice - and other provisions required by the GPL. If you do not delete - the provisions above, a recipient may use your version of this - file under either the MPL or the GPL. - ======================================================================*/ #include diff --git a/drivers/pcmcia/sa11xx_base.h b/drivers/pcmcia/sa11xx_base.h index 3d76d720f463de..c2dbdc5495f78e 100644 --- a/drivers/pcmcia/sa11xx_base.h +++ b/drivers/pcmcia/sa11xx_base.h @@ -1,33 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /*====================================================================== Device driver for the PCMCIA control functionality of StrongARM SA-1100 microprocessors. - The contents of this file are subject to the Mozilla Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. - The initial developer of the original code is John G. Dorsey . Portions created by John G. Dorsey are Copyright (C) 1999 John G. Dorsey. All Rights Reserved. - Alternatively, the contents of this file may be used under the - terms of the GNU Public License version 2 (the "GPL"), in which - case the provisions of the GPL are applicable instead of the - above. If you wish to allow the use of your version of this file - only under the terms of the GPL and not to allow others to use - your version of this file under the MPL, indicate your decision - by deleting the provisions above and replace them with the notice - and other provisions required by the GPL. If you do not delete - the provisions above, a recipient may use your version of this - file under either the MPL or the GPL. - ======================================================================*/ #if !defined(_PCMCIA_SA1100_H) diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index 61b0c8952bb5e0..8b035367fd4268 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c @@ -1,33 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 /*====================================================================== Common support code for the PCMCIA control functionality of integrated SOCs like the SA-11x0 and PXA2xx microprocessors. - The contents of this file are subject to the Mozilla Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. - The initial developer of the original code is John G. Dorsey . Portions created by John G. Dorsey are Copyright (C) 1999 John G. Dorsey. All Rights Reserved. - Alternatively, the contents of this file may be used under the - terms of the GNU Public License version 2 (the "GPL"), in which - case the provisions of the GPL are applicable instead of the - above. If you wish to allow the use of your version of this file - only under the terms of the GPL and not to allow others to use - your version of this file under the MPL, indicate your decision - by deleting the provisions above and replace them with the notice - and other provisions required by the GPL. If you do not delete - the provisions above, a recipient may use your version of this - file under either the MPL or the GPL. - ======================================================================*/ diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c index 1a0e3f0987599d..a5fca2d14c1257 100644 --- a/drivers/pcmcia/tcic.c +++ b/drivers/pcmcia/tcic.c @@ -1,34 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 /*====================================================================== Device driver for Databook TCIC-2 PCMCIA controller tcic.c 1.111 2000/02/15 04:13:12 - The contents of this file are subject to the Mozilla Public - License Version 1.1 (the "License"); you may not use this file - except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/MPL/ - - Software distributed under the License is distributed on an "AS - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - implied. See the License for the specific language governing - rights and limitations under the License. - The initial developer of the original code is David A. Hinds . Portions created by David A. Hinds are Copyright (C) 1999 David A. Hinds. All Rights Reserved. - Alternatively, the contents of this file may be used under the - terms of the GNU General Public License version 2 (the "GPL"), in which - case the provisions of the GPL are applicable instead of the - above. If you wish to allow the use of your version of this file - only under the terms of the GPL and not to allow others to use - your version of this file under the MPL, indicate your decision - by deleting the provisions above and replace them with the notice - and other provisions required by the GPL. If you do not delete - the provisions above, a recipient may use your version of this - file under either the MPL or the GPL. - ======================================================================*/ #include diff --git a/drivers/pcmcia/tcic.h b/drivers/pcmcia/tcic.h index 2c0b8f65ad6c6f..aff1e65fc69032 100644 --- a/drivers/pcmcia/tcic.h +++ b/drivers/pcmcia/tcic.h @@ -1,30 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * tcic.h 1.13 1999/10/25 20:03:34 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. */ #ifndef _LINUX_TCIC_H diff --git a/drivers/pcmcia/ti113x.h b/drivers/pcmcia/ti113x.h index 5cb670e037a0c6..a65ab56551ee93 100644 --- a/drivers/pcmcia/ti113x.h +++ b/drivers/pcmcia/ti113x.h @@ -1,30 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * ti113x.h 1.16 1999/10/25 20:03:34 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. */ #ifndef _LINUX_TI113X_H diff --git a/drivers/pcmcia/topic.h b/drivers/pcmcia/topic.h index 582688fe750540..d1ad01abab13f4 100644 --- a/drivers/pcmcia/topic.h +++ b/drivers/pcmcia/topic.h @@ -1,31 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * topic.h 1.8 1999/08/28 04:01:47 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. - * topic.h $Release$ 1999/08/28 04:01:47 */ #ifndef _LINUX_TOPIC_H diff --git a/drivers/pcmcia/vg468.h b/drivers/pcmcia/vg468.h index 88c2b487f675fc..c582fc8086c26d 100644 --- a/drivers/pcmcia/vg468.h +++ b/drivers/pcmcia/vg468.h @@ -1,30 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR MPL-1.1 */ /* * vg468.h 1.11 1999/10/25 20:03:34 * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License - * at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and - * limitations under the License. - * * The initial developer of the original code is David A. Hinds * . Portions created by David A. Hinds * are Copyright (C) 1999 David A. Hinds. All Rights Reserved. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision by - * deleting the provisions above and replace them with the notice and - * other provisions required by the GPL. If you do not delete the - * provisions above, a recipient may use your version of this file - * under either the MPL or the GPL. */ #ifndef _LINUX_VG468_H From patchwork Fri May 12 10:06:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 681570 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D421C7EE39 for ; Fri, 12 May 2023 10:07:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240694AbjELKHY (ORCPT ); Fri, 12 May 2023 06:07:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240091AbjELKHK (ORCPT ); Fri, 12 May 2023 06:07:10 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CAE3E4B; Fri, 12 May 2023 03:07:04 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1ab05018381so90185175ad.2; Fri, 12 May 2023 03:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683886024; x=1686478024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=91yi06xLF2ixkxLxpr3QLIL+JikkiNbbtse+nlfJyhw=; b=UnbpswQJRWvRzMcbluMbM8TeE2waO6BN/OyUBrA4lA/sYx8Svp3o9Tc+iSJvCEf0+e v7UkX+wg0JD7nkVpKLwLjHC9ThtWjJPEyHnKhfVPhCgFUc+S+MXpPLJ2lzHU5Z7F+O+t eOcCZxnZA/Y+JUQ3eV739S7BE+APuVg5P1Z8F9BlmdE227yvYD+L/QzkqqKRDCrrg4QF /RvrJuRCvH5GxAxKBnuixRv3RrSzGyGGsUSyOQ+56JfuJyH33l1cEi/+fNMOADDDZwL+ xn99REELqSdClTAkv7odXx3CZ5ZaOeZG6KbzDH8SZdiIWTxC6VHyWpR/tZXKMpJvysKp l80A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683886024; x=1686478024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=91yi06xLF2ixkxLxpr3QLIL+JikkiNbbtse+nlfJyhw=; b=HgWRPYqDYz61L0O/Zg3Qq11JbScBRc2mwX1xT0d9fjBO6GbRd0AJUy7ah7DGIKv/cX 38kb/AsT2Z09njejmr8hBJu/nM9zDcrjcynJCrXwxHYryxa1EMXIBCoFzPrk9Pjv7NpZ d6t0g5cKO2rB0oEExuTM6j4/J7N9rILQqsdQfP02C9c82vPlvebYXCJeceKJKm+Z9UvZ +N37Y4Nh6UB3Vgsf+Ew5pgRPlsaraYFfEE+6I8mL/qliQTSBlHPEY/8bVzv95kmThm/o sEmqhzrLEEdb0CIhXNwBqufSMh7ynqjzpebsZYHXvrbaCWNG4iD5Qil+aFSSGAAa1Sfy xQyA== X-Gm-Message-State: AC+VfDyHCv2FKnsKifVSQ6d5BKNwkDzJ4LESLW6G/BtzrgtW5WbzlxRm Wer9caKwq3EPfJSouRAxKxo= X-Google-Smtp-Source: ACHHUZ7n0t32yMOYWRvZuuT/OzDaSwA+wYobk0k0kMWFO+/YCVLDSoAWxBstY0ckRQKHirEC+MlElA== X-Received: by 2002:a17:902:ea12:b0:1ad:e2b6:d292 with SMTP id s18-20020a170902ea1200b001ade2b6d292mr2078501plg.4.1683886023553; Fri, 12 May 2023 03:07:03 -0700 (PDT) Received: from debian.me (subs28-116-206-12-58.three.co.id. [116.206.12.58]) by smtp.gmail.com with ESMTPSA id n18-20020a170902d2d200b001aaeba5ce0fsm7514313plc.68.2023.05.12.03.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 03:07:03 -0700 (PDT) Received: by debian.me (Postfix, from userid 1000) id AF8CB106B42; Fri, 12 May 2023 17:06:55 +0700 (WIB) From: Bagas Sanjaya To: Linux SPDX Licenses , Linux DRI Development , Linux Kernel Mailing List , Linux Networking , Linux ARM , Linux Staging Drivers , Linux Watchdog Devices , Linux Kernel Actions Cc: Diederik de Haas , Kate Stewart , Philippe Ombredanne , Thomas Gleixner , David Airlie , Karsten Keil , Jay Vosburgh , Andy Gospodarek , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Sam Creasey , Dominik Brodowski , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Greg Kroah-Hartman , Wim Van Sebroeck , Guenter Roeck , Jan Kara , =?utf-8?q?And?= =?utf-8?q?reas_F=C3=A4rber?= , Manivannan Sadhasivam , Bagas Sanjaya , Dan Carpenter , Simon Horman Subject: [PATCH v2 07/10] drivers: staging: wlan-ng: Remove GPL/MPL boilerplate Date: Fri, 12 May 2023 17:06:18 +0700 Message-Id: <20230512100620.36807-8-bagasdotme@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230512100620.36807-1-bagasdotme@gmail.com> References: <20230512100620.36807-1-bagasdotme@gmail.com> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=36222; i=bagasdotme@gmail.com; h=from:subject; bh=pDKND6kxrMZMIgikM89EZnWyHuNOrHokIVM19TuzgCU=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDClx/DPm5MrpSmyVd/7yOSUppzqg/lZtMhPPkiXHttqvX nVj9YcTHaUsDGJcDLJiiiyTEvmaTu8yErnQvtYRZg4rE8gQBi5OAZgI00eG/6nH2vTlM72OfOph b0qxvTF90x01K7ZpExQ+1p8Kf9wWO4WR4UlK3cXWD9dnaLzZU2YY+/ds5SPerF/9DQkJJ3Pre/X nMAEA X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Remove the license boilerplate as there is already SPDX license identifier added in b24413180f5600 ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license") which fulfills the same intention as the boilerplate. Cc: Dan Carpenter Cc: Kate Stewart Cc: Philippe Ombredanne Cc: Thomas Gleixner Reviewed-by: Simon Horman Signed-off-by: Bagas Sanjaya --- drivers/staging/wlan-ng/hfa384x.h | 21 --------------------- drivers/staging/wlan-ng/hfa384x_usb.c | 21 --------------------- drivers/staging/wlan-ng/p80211conv.c | 21 --------------------- drivers/staging/wlan-ng/p80211conv.h | 21 --------------------- drivers/staging/wlan-ng/p80211hdr.h | 21 --------------------- drivers/staging/wlan-ng/p80211ioctl.h | 21 --------------------- drivers/staging/wlan-ng/p80211metadef.h | 21 --------------------- drivers/staging/wlan-ng/p80211metastruct.h | 21 --------------------- drivers/staging/wlan-ng/p80211mgmt.h | 21 --------------------- drivers/staging/wlan-ng/p80211msg.h | 21 --------------------- drivers/staging/wlan-ng/p80211netdev.c | 21 --------------------- drivers/staging/wlan-ng/p80211netdev.h | 21 --------------------- drivers/staging/wlan-ng/p80211req.c | 21 --------------------- drivers/staging/wlan-ng/p80211req.h | 21 --------------------- drivers/staging/wlan-ng/p80211types.h | 21 --------------------- drivers/staging/wlan-ng/p80211wep.c | 21 --------------------- drivers/staging/wlan-ng/prism2fw.c | 21 --------------------- drivers/staging/wlan-ng/prism2mgmt.c | 21 --------------------- drivers/staging/wlan-ng/prism2mgmt.h | 21 --------------------- drivers/staging/wlan-ng/prism2mib.c | 21 --------------------- drivers/staging/wlan-ng/prism2sta.c | 21 --------------------- 21 files changed, 441 deletions(-) diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h index e33dd1b9c40e58..a4799589e46945 100644 --- a/drivers/staging/wlan-ng/hfa384x.h +++ b/drivers/staging/wlan-ng/hfa384x.h @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c index c7cd54171d9943..3e8c92675c8234 100644 --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/drivers/staging/wlan-ng/hfa384x_usb.c @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c index cd271b1da69f64..048e1c3fe19b32 100644 --- a/drivers/staging/wlan-ng/p80211conv.c +++ b/drivers/staging/wlan-ng/p80211conv.c @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h index dfb762bce84d07..45234769f45d6e 100644 --- a/drivers/staging/wlan-ng/p80211conv.h +++ b/drivers/staging/wlan-ng/p80211conv.h @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/p80211hdr.h b/drivers/staging/wlan-ng/p80211hdr.h index 93195a4c5b014a..7ea1c8ec05ed05 100644 --- a/drivers/staging/wlan-ng/p80211hdr.h +++ b/drivers/staging/wlan-ng/p80211hdr.h @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/p80211ioctl.h b/drivers/staging/wlan-ng/p80211ioctl.h index b50ce11147dd78..176e327a45bc4b 100644 --- a/drivers/staging/wlan-ng/p80211ioctl.h +++ b/drivers/staging/wlan-ng/p80211ioctl.h @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/p80211metadef.h b/drivers/staging/wlan-ng/p80211metadef.h index 1b91b64c12ed1a..1cbb4b67a9a6a6 100644 --- a/drivers/staging/wlan-ng/p80211metadef.h +++ b/drivers/staging/wlan-ng/p80211metadef.h @@ -6,27 +6,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/p80211metastruct.h b/drivers/staging/wlan-ng/p80211metastruct.h index 4adc64580185a1..ea8b7ee108171f 100644 --- a/drivers/staging/wlan-ng/p80211metastruct.h +++ b/drivers/staging/wlan-ng/p80211metastruct.h @@ -6,27 +6,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h index fc23fae5651b9e..7ffc202d90074b 100644 --- a/drivers/staging/wlan-ng/p80211mgmt.h +++ b/drivers/staging/wlan-ng/p80211mgmt.h @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/p80211msg.h b/drivers/staging/wlan-ng/p80211msg.h index f68d8b7d5ad883..d56bc6079ed4f8 100644 --- a/drivers/staging/wlan-ng/p80211msg.h +++ b/drivers/staging/wlan-ng/p80211msg.h @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c index 6bef419e8ad0c8..8634fc89a6c22f 100644 --- a/drivers/staging/wlan-ng/p80211netdev.c +++ b/drivers/staging/wlan-ng/p80211netdev.c @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h index 1cee51a1075ed6..f5186380b6290a 100644 --- a/drivers/staging/wlan-ng/p80211netdev.h +++ b/drivers/staging/wlan-ng/p80211netdev.h @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c index 809cf3d480e952..6ec559ffd2f991 100644 --- a/drivers/staging/wlan-ng/p80211req.c +++ b/drivers/staging/wlan-ng/p80211req.c @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/p80211req.h b/drivers/staging/wlan-ng/p80211req.h index bc45cd5f91e464..39213f73913c56 100644 --- a/drivers/staging/wlan-ng/p80211req.h +++ b/drivers/staging/wlan-ng/p80211req.h @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/p80211types.h b/drivers/staging/wlan-ng/p80211types.h index b2ed969604133e..5e4ea5f92058e5 100644 --- a/drivers/staging/wlan-ng/p80211types.h +++ b/drivers/staging/wlan-ng/p80211types.h @@ -9,27 +9,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/p80211wep.c b/drivers/staging/wlan-ng/p80211wep.c index 3ff7ee7011df35..e7b26b057124ab 100644 --- a/drivers/staging/wlan-ng/p80211wep.c +++ b/drivers/staging/wlan-ng/p80211wep.c @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index 11658865ca5050..5d03b2b9aab40a 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c index 9030a8939a9bf3..e7820b212b4fa1 100644 --- a/drivers/staging/wlan-ng/prism2mgmt.c +++ b/drivers/staging/wlan-ng/prism2mgmt.c @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/prism2mgmt.h b/drivers/staging/wlan-ng/prism2mgmt.h index 7132cec2d7eb80..083a055ee98662 100644 --- a/drivers/staging/wlan-ng/prism2mgmt.h +++ b/drivers/staging/wlan-ng/prism2mgmt.h @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c index fcf8313870af48..4346b90c1a770e 100644 --- a/drivers/staging/wlan-ng/prism2mib.c +++ b/drivers/staging/wlan-ng/prism2mib.c @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index daa7cc4e897c91..57180bb71699f7 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c @@ -8,27 +8,6 @@ * * linux-wlan * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU Public License version 2 (the "GPL"), in which - * case the provisions of the GPL are applicable instead of the - * above. If you wish to allow the use of your version of this file - * only under the terms of the GPL and not to allow others to use - * your version of this file under the MPL, indicate your decision - * by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL. If you do not delete - * the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * * -------------------------------------------------------------------- * * Inquiries regarding the linux-wlan Open Source project can be From patchwork Fri May 12 10:06:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 681572 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3C9CC7EE24 for ; Fri, 12 May 2023 10:07:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240653AbjELKHU (ORCPT ); Fri, 12 May 2023 06:07:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240514AbjELKHI (ORCPT ); Fri, 12 May 2023 06:07:08 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C13BE55; Fri, 12 May 2023 03:07:04 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-52079a12451so6962099a12.3; Fri, 12 May 2023 03:07:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683886024; x=1686478024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AEkf8gWG96+9b1qBPiSXz5T2EndzrX4ufiHLwT0g7bA=; b=NtT2Weul5m/pMpgN7JMgRZwAS7itAs93/P0LzS4vUShEcK4Wgq6OBo6+Iatwn9wpVD gjwOOVQF9lpQUpgZtCaIQd72ZQugKVSyWb/PZE3vbwTwZfVQOVRMM5yFDD9yOMR8F8v9 Q6mqq6T2rl9lqGnp0ASIgno/r7T1raas8x36CbHSlmTglCyt796jfNmZNms+AHHWvurY bpdR4yzAgfnxl9sTBuFoAQ83WYpg4uDnVq+BVTki6Qok27DFkNkCpOj+hRAet1+egzhD pOlOJRvO3bBmkfuIVwyM2IrmdnbNpKYJ1dCyJSgwjBaFgR6C5YpCvelGbphwVnKpkpl7 XTUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683886024; x=1686478024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AEkf8gWG96+9b1qBPiSXz5T2EndzrX4ufiHLwT0g7bA=; b=gesSp8UOjlWGm2zdMhLJAIvCpMrIkfSNthQCQ6nsPEgUTbTyJKslHca7PK6X4meJjd lNQtsEO4PUIbLtRDkJceaUzZ0MW3O5r0ReJhyfy7o1mZxykha/C6TVC/MU5R6SkHmpgy HPLgnv+GUb8BMCkA6OO2EulGQ1PzeZtUStCjQBg668i0RM1lYExnAzhWjoXWivfyWzun 4KQ41XdDShsWhQ3EsQTquOeL8ta6tI0CwagmWJ5OBRg66O5TiL0VihiDcN0ngo45woMM rK/tWhgSTqNzkQzlRQpBjkAs63Wtn56OsfgCiISDGgG799Sh9hK2wbVHM6jlqgcLSIFj G2bQ== X-Gm-Message-State: AC+VfDx4G/Xesf3bJx5kFOzJtEmkl2m63Vi3dpRl0/608iBHPwOg5Awf 0y99EL8I7852raN1dFpvUls= X-Google-Smtp-Source: ACHHUZ7imq7bgHR/sJmRlazsESDion5s8yIT3WhCK3D8T5obXOuXCzu+YMDtulbCky0jUvuEXkpPNA== X-Received: by 2002:a17:902:a609:b0:1ac:946e:4690 with SMTP id u9-20020a170902a60900b001ac946e4690mr12908005plq.49.1683886023679; Fri, 12 May 2023 03:07:03 -0700 (PDT) Received: from debian.me (subs28-116-206-12-58.three.co.id. [116.206.12.58]) by smtp.gmail.com with ESMTPSA id n21-20020a170902969500b001a634e79af0sm7528924plp.283.2023.05.12.03.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 03:07:03 -0700 (PDT) Received: by debian.me (Postfix, from userid 1000) id 49702106B43; Fri, 12 May 2023 17:06:56 +0700 (WIB) From: Bagas Sanjaya To: Linux SPDX Licenses , Linux DRI Development , Linux Kernel Mailing List , Linux Networking , Linux ARM , Linux Staging Drivers , Linux Watchdog Devices , Linux Kernel Actions Cc: Diederik de Haas , Kate Stewart , Philippe Ombredanne , Thomas Gleixner , David Airlie , Karsten Keil , Jay Vosburgh , Andy Gospodarek , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Sam Creasey , Dominik Brodowski , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Greg Kroah-Hartman , Wim Van Sebroeck , Guenter Roeck , Jan Kara , =?utf-8?q?And?= =?utf-8?q?reas_F=C3=A4rber?= , Manivannan Sadhasivam , Bagas Sanjaya , Simon Horman Subject: [PATCH v2 10/10] include: synclink: Replace GPL license notice with SPDX identifier Date: Fri, 12 May 2023 17:06:21 +0700 Message-Id: <20230512100620.36807-11-bagasdotme@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230512100620.36807-1-bagasdotme@gmail.com> References: <20230512100620.36807-1-bagasdotme@gmail.com> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=881; i=bagasdotme@gmail.com; h=from:subject; bh=PkQY9HnKXIwg0IaXpF33XHuRDzB1ZRiNQ1FLD5oV4q4=; b=owGbwMvMwCX2bWenZ2ig32LG02pJDClx/DNlZ3lanJT7p1ayYymLq+t2lUf7xU5xTbIv2zq/P c1cwzS3o5SFQYyLQVZMkWVSIl/T6V1GIhfa1zrCzGFlAhnCwMUpABPZwsnI0DSB1bvrwoZSud8H 0ne/3frdnuH0pjxjmXVPMvvE5m9y3cPwP/SEaKC5kN1FhVtfGU8aFdcIxYbGRS4xOZrN1MAp9PA sNwA= X-Developer-Key: i=bagasdotme@gmail.com; a=openpgp; fpr=701B806FDCA5D3A58FFB8F7D7C276C64A5E44A1D Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Replace unversioned GPL license notice with appropriate SPDX identifier, which is GPL 1.0+. Reviewed-by: Simon Horman Signed-off-by: Bagas Sanjaya --- include/linux/synclink.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/linux/synclink.h b/include/linux/synclink.h index f1405b1c71ba15..85195634c81dfa 100644 --- a/include/linux/synclink.h +++ b/include/linux/synclink.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-1.0+ */ /* * SyncLink Multiprotocol Serial Adapter Driver * @@ -5,8 +6,6 @@ * * Copyright (C) 1998-2000 by Microgate Corporation * - * Redistribution of this file is permitted under - * the terms of the GNU Public License (GPL) */ #ifndef _SYNCLINK_H_ #define _SYNCLINK_H_