linux-audit.redhat.com archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] audit: Convert to SPDX identifier
@ 2021-09-14  3:33 Cai Huoqing
  2021-09-14 14:48 ` Paul Moore
  0 siblings, 1 reply; 2+ messages in thread
From: Cai Huoqing @ 2021-09-14  3:33 UTC (permalink / raw)
  To: caihuoqing; +Cc: linux-audit, Eric Paris, linux-kernel

Use SPDX-License-Identifier instead of a verbose license text.

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
v1->v2: Change recommended token from "GPL-2.0+" to "GPL-2.0-or-later"

 kernel/auditsc.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 8dd73a64f921..969c1613fed9 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* auditsc.c -- System-call auditing support
  * Handles all system-call specific auditing features.
  *
@@ -6,20 +7,6 @@
  * Copyright (C) 2005, 2006 IBM Corporation
  * All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  * Written by Rickard E. (Rik) Faith <faith@redhat.com>
  *
  * Many of the ideas implemented here are from Stephen C. Tweedie,
-- 
2.25.1

--
Linux-audit mailing list
Linux-audit@redhat.com
https://listman.redhat.com/mailman/listinfo/linux-audit


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] audit: Convert to SPDX identifier
  2021-09-14  3:33 [PATCH v2] audit: Convert to SPDX identifier Cai Huoqing
@ 2021-09-14 14:48 ` Paul Moore
  0 siblings, 0 replies; 2+ messages in thread
From: Paul Moore @ 2021-09-14 14:48 UTC (permalink / raw)
  To: Cai Huoqing; +Cc: linux-audit, linux-kernel, Eric Paris

On Mon, Sep 13, 2021 at 11:33 PM Cai Huoqing <caihuoqing@baidu.com> wrote:
>
> Use SPDX-License-Identifier instead of a verbose license text.
>
> Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
> ---
> v1->v2: Change recommended token from "GPL-2.0+" to "GPL-2.0-or-later"
>
>  kernel/auditsc.c | 15 +--------------
>  1 file changed, 1 insertion(+), 14 deletions(-)

Merged into audit/next, thanks!

-- 
paul moore
www.paul-moore.com

--
Linux-audit mailing list
Linux-audit@redhat.com
https://listman.redhat.com/mailman/listinfo/linux-audit


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-09-14 15:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-14  3:33 [PATCH v2] audit: Convert to SPDX identifier Cai Huoqing
2021-09-14 14:48 ` Paul Moore

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).