Re: [patch 11/25] treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 36

[Allison Randal <allison@lohutok.net>]

Reviewed-by: Allison Randal <allison@lohutok.net>

On 5/20/19 6:08 PM, Thomas Gleixner wrote:
> Based on 1 normalized pattern(s):
> 
>   this program is free software you can redistribute it and or modify
>   it under the terms of the gnu general public licence as published by
>   the free software foundation either version 2 of the licence or at
>   your option any later version
> 
> extracted by the scancode license scanner the SPDX license identifier
> 
>   GPL-2.0-or-later
> 
> has been chosen to replace the boilerplate/reference in 114 file(s).
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: linux-spdx@vger.kernel.org
> 
> ---
> https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch2&id=005f80e9f871
> ---
>  arch/c6x/include/asm/irqflags.h           |    6 +-----
>  arch/riscv/include/asm/atomic.h           |    6 +-----
>  certs/blacklist.c                         |    6 +-----
>  certs/system_keyring.c                    |    6 +-----
>  crypto/asymmetric_keys/asymmetric_keys.h  |    6 +-----
>  crypto/asymmetric_keys/asymmetric_type.c  |    6 +-----
>  crypto/asymmetric_keys/mscode_parser.c    |    6 +-----
>  crypto/asymmetric_keys/pkcs7_key_type.c   |    6 +-----
>  crypto/asymmetric_keys/pkcs7_parser.c     |    6 +-----
>  crypto/asymmetric_keys/pkcs7_parser.h     |    6 +-----
>  crypto/asymmetric_keys/pkcs7_trust.c      |    6 +-----
>  crypto/asymmetric_keys/pkcs7_verify.c     |    6 +-----
>  crypto/asymmetric_keys/pkcs8_parser.c     |    6 +-----
>  crypto/asymmetric_keys/public_key.c       |    6 +-----
>  crypto/asymmetric_keys/restrict.c         |    6 +-----
>  crypto/asymmetric_keys/signature.c        |    6 +-----
>  crypto/asymmetric_keys/verify_pefile.c    |    6 +-----
>  crypto/asymmetric_keys/verify_pefile.h    |    6 +-----
>  crypto/asymmetric_keys/x509_cert_parser.c |    6 +-----
>  crypto/asymmetric_keys/x509_parser.h      |    6 +-----
>  crypto/asymmetric_keys/x509_public_key.c  |    6 +-----
>  crypto/rsa.c                              |    6 +-----
>  drivers/rtc/rtc-st-lpc.c                  |    6 +-----
>  fs/afs/addr_list.c                        |    6 +-----
>  fs/afs/dir_edit.c                         |    6 +-----
>  fs/afs/dir_silly.c                        |    6 +-----
>  fs/afs/dynroot.c                          |    6 +-----
>  fs/afs/fs_probe.c                         |    6 +-----
>  fs/afs/protocol_yfs.h                     |    6 +-----
>  fs/afs/rotate.c                           |    6 +-----
>  fs/afs/vl_probe.c                         |    6 +-----
>  fs/afs/vl_rotate.c                        |    6 +-----
>  fs/afs/xattr.c                            |    6 +-----
>  fs/afs/xdr_fs.h                           |    6 +-----
>  fs/afs/yfsclient.c                        |    6 +-----
>  fs/cachefiles/bind.c                      |    6 +-----
>  fs/cachefiles/daemon.c                    |    6 +-----
>  fs/cachefiles/interface.c                 |    6 +-----
>  fs/cachefiles/internal.h                  |    6 +-----
>  fs/cachefiles/key.c                       |    6 +-----
>  fs/cachefiles/main.c                      |    6 +-----
>  fs/cachefiles/namei.c                     |    6 +-----
>  fs/cachefiles/proc.c                      |    6 +-----
>  fs/cachefiles/rdwr.c                      |    6 +-----
>  fs/cachefiles/security.c                  |    6 +-----
>  fs/cachefiles/xattr.c                     |    6 +-----
>  fs/fs_context.c                           |    6 +-----
>  fs/fs_parser.c                            |    6 +-----
>  fs/fscache/histogram.c                    |    6 +-----
>  fs/fscache/netfs.c                        |    6 +-----
>  fs/fscache/object-list.c                  |    6 +-----
>  fs/fsopen.c                               |    6 +-----
>  fs/nfs/fscache-index.c                    |    6 +-----
>  fs/nfs/fscache.c                          |    6 +-----
>  fs/nfs/fscache.h                          |    6 +-----
>  include/asm-generic/atomic.h              |    6 +-----
>  include/asm-generic/barrier.h             |    6 +-----
>  include/asm-generic/exec.h                |    6 +-----
>  include/asm-generic/io.h                  |    6 +-----
>  include/asm-generic/switch_to.h           |    6 +-----
>  include/crypto/pkcs7.h                    |    6 +-----
>  include/crypto/public_key.h               |    6 +-----
>  include/keys/asymmetric-parser.h          |    6 +-----
>  include/keys/asymmetric-subtype.h         |    6 +-----
>  include/keys/asymmetric-type.h            |    6 +-----
>  include/keys/request_key_auth-type.h      |    6 +-----
>  include/keys/system_keyring.h             |    6 +-----
>  include/linux/asn1.h                      |    6 +-----
>  include/linux/asn1_ber_bytecode.h         |    6 +-----
>  include/linux/asn1_decoder.h              |    6 +-----
>  include/linux/assoc_array.h               |    6 +-----
>  include/linux/assoc_array_priv.h          |    6 +-----
>  include/linux/count_zeros.h               |    6 +-----
>  include/linux/cred.h                      |    6 +-----
>  include/linux/fs_context.h                |    6 +-----
>  include/linux/fs_parser.h                 |    6 +-----
>  include/linux/key-type.h                  |    6 +-----
>  include/linux/keyctl.h                    |    6 +-----
>  include/linux/oid_registry.h              |    6 +-----
>  include/linux/verification.h              |    6 +-----
>  include/trace/events/afs.h                |    6 +-----
>  include/trace/events/cachefiles.h         |    6 +-----
>  include/trace/events/fscache.h            |    6 +-----
>  include/trace/events/i2c.h                |    6 +-----
>  include/trace/events/rxrpc.h              |    6 +-----
>  include/trace/events/smbus.h              |    6 +-----
>  include/uapi/linux/rxrpc.h                |    6 +-----
>  kernel/cred.c                             |    6 +-----
>  kernel/module-internal.h                  |    6 +-----
>  kernel/module_signing.c                   |    6 +-----
>  lib/asn1_decoder.c                        |    6 +-----
>  lib/assoc_array.c                         |    6 +-----
>  lib/build_OID_registry                    |    6 +-----
>  lib/is_single_threaded.c                  |    6 +-----
>  lib/oid_registry.c                        |    6 +-----
>  net/rxrpc/conn_client.c                   |    7 +------
>  net/rxrpc/conn_service.c                  |    6 +-----
>  net/rxrpc/insecure.c                      |    6 +-----
>  net/rxrpc/local_object.c                  |    6 +-----
>  net/rxrpc/misc.c                          |    6 +-----
>  net/rxrpc/net_ns.c                        |    6 +-----
>  net/rxrpc/sendmsg.c                       |    6 +-----
>  net/rxrpc/sysctl.c                        |    6 +-----
>  net/rxrpc/utils.c                         |    6 +-----
>  samples/vfs/test-fsmount.c                |    6 +-----
>  samples/vfs/test-statx.c                  |    6 +-----
>  scripts/asn1_compiler.c                   |    6 +-----
>  security/keys/big_key.c                   |    6 +-----
>  security/keys/gc.c                        |    6 +-----
>  security/keys/keyctl_pkey.c               |    6 +-----
>  security/keys/persistent.c                |    6 +-----
>  security/keys/sysctl.c                    |    6 +-----
>  tools/include/asm-generic/barrier.h       |    6 +-----
>  113 files changed, 113 insertions(+), 566 deletions(-)
> 
> --- a/arch/c6x/include/asm/irqflags.h
> +++ b/arch/c6x/include/asm/irqflags.h
> @@ -1,13 +1,9 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   *  C6X IRQ flag handling
>   *
>   * Copyright (C) 2010 Texas Instruments Incorporated
>   * Written by Mark Salter (msalter@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _ASM_IRQFLAGS_H
> --- a/arch/riscv/include/asm/atomic.h
> +++ b/arch/riscv/include/asm/atomic.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Copyright (C) 2012 Regents of the University of California
>   * Copyright (C) 2017 SiFive
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _ASM_RISCV_ATOMIC_H
> --- a/certs/blacklist.c
> +++ b/certs/blacklist.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* System hash blacklist.
>   *
>   * Copyright (C) 2016 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) "blacklist: "fmt
> --- a/certs/system_keyring.c
> +++ b/certs/system_keyring.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* System trusted keyring for trusted public keys
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/export.h>
> --- a/crypto/asymmetric_keys/asymmetric_keys.h
> +++ b/crypto/asymmetric_keys/asymmetric_keys.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Internal definitions for asymmetric key type
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <keys/asymmetric-type.h>
> --- a/crypto/asymmetric_keys/asymmetric_type.c
> +++ b/crypto/asymmetric_keys/asymmetric_type.c
> @@ -1,14 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Asymmetric public-key cryptography key type
>   *
>   * See Documentation/crypto/asymmetric-keys.txt
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  #include <keys/asymmetric-subtype.h>
>  #include <keys/asymmetric-parser.h>
> --- a/crypto/asymmetric_keys/mscode_parser.c
> +++ b/crypto/asymmetric_keys/mscode_parser.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Parse a Microsoft Individual Code Signing blob
>   *
>   * Copyright (C) 2014 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) "MSCODE: "fmt
> --- a/crypto/asymmetric_keys/pkcs7_key_type.c
> +++ b/crypto/asymmetric_keys/pkcs7_key_type.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Testing module to load key from trusted PKCS#7 message
>   *
>   * Copyright (C) 2014 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) "PKCS7key: "fmt
> --- a/crypto/asymmetric_keys/pkcs7_parser.c
> +++ b/crypto/asymmetric_keys/pkcs7_parser.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* PKCS#7 parser
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) "PKCS7: "fmt
> --- a/crypto/asymmetric_keys/pkcs7_parser.h
> +++ b/crypto/asymmetric_keys/pkcs7_parser.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* PKCS#7 crypto data parser internal definitions
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/oid_registry.h>
> --- a/crypto/asymmetric_keys/pkcs7_trust.c
> +++ b/crypto/asymmetric_keys/pkcs7_trust.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Validate the trust chain of a PKCS#7 message.
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) "PKCS7: "fmt
> --- a/crypto/asymmetric_keys/pkcs7_verify.c
> +++ b/crypto/asymmetric_keys/pkcs7_verify.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Verify the signature on a PKCS#7 message.
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) "PKCS7: "fmt
> --- a/crypto/asymmetric_keys/pkcs8_parser.c
> +++ b/crypto/asymmetric_keys/pkcs8_parser.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* PKCS#8 Private Key parser [RFC 5208].
>   *
>   * Copyright (C) 2016 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) "PKCS8: "fmt
> --- a/crypto/asymmetric_keys/public_key.c
> +++ b/crypto/asymmetric_keys/public_key.c
> @@ -1,14 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* In-software asymmetric public-key crypto subtype
>   *
>   * See Documentation/crypto/asymmetric-keys.txt
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) "PKEY: "fmt
> --- a/crypto/asymmetric_keys/restrict.c
> +++ b/crypto/asymmetric_keys/restrict.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Instantiate a public key crypto key from an X.509 Certificate
>   *
>   * Copyright (C) 2012, 2016 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) "ASYM: "fmt
> --- a/crypto/asymmetric_keys/signature.c
> +++ b/crypto/asymmetric_keys/signature.c
> @@ -1,14 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Signature verification with an asymmetric key
>   *
>   * See Documentation/crypto/asymmetric-keys.txt
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) "SIG: "fmt
> --- a/crypto/asymmetric_keys/verify_pefile.c
> +++ b/crypto/asymmetric_keys/verify_pefile.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Parse a signed PE binary
>   *
>   * Copyright (C) 2014 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) "PEFILE: "fmt
> --- a/crypto/asymmetric_keys/verify_pefile.h
> +++ b/crypto/asymmetric_keys/verify_pefile.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* PE Binary parser bits
>   *
>   * Copyright (C) 2014 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <crypto/pkcs7.h>
> --- a/crypto/asymmetric_keys/x509_cert_parser.c
> +++ b/crypto/asymmetric_keys/x509_cert_parser.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* X.509 certificate parser
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) "X.509: "fmt
> --- a/crypto/asymmetric_keys/x509_parser.h
> +++ b/crypto/asymmetric_keys/x509_parser.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* X.509 certificate parser internal definitions
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/time.h>
> --- a/crypto/asymmetric_keys/x509_public_key.c
> +++ b/crypto/asymmetric_keys/x509_public_key.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Instantiate a public key crypto key from an X.509 Certificate
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) "X.509: "fmt
> --- a/crypto/rsa.c
> +++ b/crypto/rsa.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* RSA asymmetric public-key algorithm [RFC3447]
>   *
>   * Copyright (c) 2015, Intel Corporation
>   * Authors: Tadeusz Struk <tadeusz.struk@intel.com>
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/module.h>
> --- a/drivers/rtc/rtc-st-lpc.c
> +++ b/drivers/rtc/rtc-st-lpc.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * rtc-st-lpc.c - ST's LPC RTC, powered by the Low Power Timer
>   *
> @@ -7,11 +8,6 @@
>   *         Lee Jones <lee.jones@linaro.org> for STMicroelectronics
>   *
>   * Based on the original driver written by Stuart Menefy.
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/clk.h>
> --- a/fs/afs/addr_list.c
> +++ b/fs/afs/addr_list.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Server address list management
>   *
>   * Copyright (C) 2017 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/slab.h>
> --- a/fs/afs/dir_edit.c
> +++ b/fs/afs/dir_edit.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* AFS filesystem directory editing
>   *
>   * Copyright (C) 2018 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/kernel.h>
> --- a/fs/afs/dir_silly.c
> +++ b/fs/afs/dir_silly.c
> @@ -1,13 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* AFS silly rename handling
>   *
>   * Copyright (C) 2019 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
>   * - Derived from NFS's sillyrename.
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/kernel.h>
> --- a/fs/afs/dynroot.c
> +++ b/fs/afs/dynroot.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* AFS dynamic root handling
>   *
>   * Copyright (C) 2018 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/fs.h>
> --- a/fs/afs/fs_probe.c
> +++ b/fs/afs/fs_probe.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* AFS fileserver probing
>   *
>   * Copyright (C) 2018 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/sched.h>
> --- a/fs/afs/protocol_yfs.h
> +++ b/fs/afs/protocol_yfs.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* YFS protocol bits
>   *
>   * Copyright (C) 2018 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define YFS_FS_SERVICE	2500
> --- a/fs/afs/rotate.c
> +++ b/fs/afs/rotate.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Handle fileserver selection and rotation.
>   *
>   * Copyright (C) 2017 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/kernel.h>
> --- a/fs/afs/vl_probe.c
> +++ b/fs/afs/vl_probe.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* AFS vlserver probing
>   *
>   * Copyright (C) 2018 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/sched.h>
> --- a/fs/afs/vl_rotate.c
> +++ b/fs/afs/vl_rotate.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Handle vlserver selection and rotation.
>   *
>   * Copyright (C) 2018 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/kernel.h>
> --- a/fs/afs/xattr.c
> +++ b/fs/afs/xattr.c
> @@ -1,13 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Extended attribute handling for AFS.  We use xattrs to get and set metadata
>   * instead of providing pioctl().
>   *
>   * Copyright (C) 2017 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/slab.h>
> --- a/fs/afs/xdr_fs.h
> +++ b/fs/afs/xdr_fs.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* AFS fileserver XDR types
>   *
>   * Copyright (C) 2018 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef XDR_FS_H
> --- a/fs/afs/yfsclient.c
> +++ b/fs/afs/yfsclient.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* YFS File Server client stubs
>   *
>   * Copyright (C) 2018 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/init.h>
> --- a/fs/cachefiles/bind.c
> +++ b/fs/cachefiles/bind.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Bind and unbind a cache from the filesystem backing it
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/module.h>
> --- a/fs/cachefiles/daemon.c
> +++ b/fs/cachefiles/daemon.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Daemon interface
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/module.h>
> --- a/fs/cachefiles/interface.c
> +++ b/fs/cachefiles/interface.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* FS-Cache interface to CacheFiles
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/slab.h>
> --- a/fs/cachefiles/internal.h
> +++ b/fs/cachefiles/internal.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* General netfs cache on cache files internal defs
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifdef pr_fmt
> --- a/fs/cachefiles/key.c
> +++ b/fs/cachefiles/key.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Key to pathname encoder
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/slab.h>
> --- a/fs/cachefiles/main.c
> +++ b/fs/cachefiles/main.c
> @@ -1,13 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Network filesystem caching backend to use cache files on a premounted
>   * filesystem
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/module.h>
> --- a/fs/cachefiles/namei.c
> +++ b/fs/cachefiles/namei.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* CacheFiles path walking and related routines
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/module.h>
> --- a/fs/cachefiles/proc.c
> +++ b/fs/cachefiles/proc.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* CacheFiles statistics
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/module.h>
> --- a/fs/cachefiles/rdwr.c
> +++ b/fs/cachefiles/rdwr.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Storage object read/write
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/mount.h>
> --- a/fs/cachefiles/security.c
> +++ b/fs/cachefiles/security.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* CacheFiles security management
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/fs.h>
> --- a/fs/cachefiles/xattr.c
> +++ b/fs/cachefiles/xattr.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* CacheFiles extended attribute management
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/module.h>
> --- a/fs/fs_context.c
> +++ b/fs/fs_context.c
> @@ -1,13 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Provide a way to create a superblock configuration context within the kernel
>   * that allows a superblock to be set up prior to mounting.
>   *
>   * Copyright (C) 2017 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> --- a/fs/fs_parser.c
> +++ b/fs/fs_parser.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Filesystem parameter parser.
>   *
>   * Copyright (C) 2018 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/export.h>
> --- a/fs/fscache/histogram.c
> +++ b/fs/fscache/histogram.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* FS-Cache latency histogram
>   *
>   * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define FSCACHE_DEBUG_LEVEL THREAD
> --- a/fs/fscache/netfs.c
> +++ b/fs/fscache/netfs.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* FS-Cache netfs (client) registration
>   *
>   * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define FSCACHE_DEBUG_LEVEL COOKIE
> --- a/fs/fscache/object-list.c
> +++ b/fs/fscache/object-list.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Global fscache object list maintainer and viewer
>   *
>   * Copyright (C) 2009 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define FSCACHE_DEBUG_LEVEL COOKIE
> --- a/fs/fsopen.c
> +++ b/fs/fsopen.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Filesystem access-by-fd.
>   *
>   * Copyright (C) 2017 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/fs_context.h>
> --- a/fs/nfs/fscache-index.c
> +++ b/fs/nfs/fscache-index.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* NFS FS-Cache index structure definition
>   *
>   * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/init.h>
> --- a/fs/nfs/fscache.c
> +++ b/fs/nfs/fscache.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* NFS filesystem cache interface
>   *
>   * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/init.h>
> --- a/fs/nfs/fscache.h
> +++ b/fs/nfs/fscache.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* NFS filesystem cache interface definitions
>   *
>   * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _NFS_FSCACHE_H
> --- a/include/asm-generic/atomic.h
> +++ b/include/asm-generic/atomic.h
> @@ -1,14 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   * Generic C implementation of atomic counter operations. Usable on
>   * UP systems only. Do not include in machine independent code.
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  #ifndef __ASM_GENERIC_ATOMIC_H
>  #define __ASM_GENERIC_ATOMIC_H
> --- a/include/asm-generic/barrier.h
> +++ b/include/asm-generic/barrier.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   * Generic barrier definitions.
>   *
> @@ -6,11 +7,6 @@
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  #ifndef __ASM_GENERIC_BARRIER_H
>  #define __ASM_GENERIC_BARRIER_H
> --- a/include/asm-generic/exec.h
> +++ b/include/asm-generic/exec.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Generic process execution definitions.
>   *
>   * It should be possible to use these on really simple architectures,
> @@ -5,11 +6,6 @@
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  #ifndef __ASM_GENERIC_EXEC_H
>  #define __ASM_GENERIC_EXEC_H
> --- a/include/asm-generic/io.h
> +++ b/include/asm-generic/io.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Generic I/O port emulation.
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  #ifndef __ASM_GENERIC_IO_H
>  #define __ASM_GENERIC_IO_H
> --- a/include/asm-generic/switch_to.h
> +++ b/include/asm-generic/switch_to.h
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Generic task switch macro wrapper.
>   *
>   * It should be possible to use these on really simple architectures,
> @@ -5,11 +6,6 @@
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  #ifndef __ASM_GENERIC_SWITCH_TO_H
>  #define __ASM_GENERIC_SWITCH_TO_H
> --- a/include/crypto/pkcs7.h
> +++ b/include/crypto/pkcs7.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* PKCS#7 crypto data parser
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _CRYPTO_PKCS7_H
> --- a/include/crypto/public_key.h
> +++ b/include/crypto/public_key.h
> @@ -1,14 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Asymmetric public-key algorithm definitions
>   *
>   * See Documentation/crypto/asymmetric-keys.txt
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _LINUX_PUBLIC_KEY_H
> --- a/include/keys/asymmetric-parser.h
> +++ b/include/keys/asymmetric-parser.h
> @@ -1,14 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Asymmetric public-key cryptography data parser
>   *
>   * See Documentation/crypto/asymmetric-keys.txt
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _KEYS_ASYMMETRIC_PARSER_H
> --- a/include/keys/asymmetric-subtype.h
> +++ b/include/keys/asymmetric-subtype.h
> @@ -1,14 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Asymmetric public-key cryptography key subtype
>   *
>   * See Documentation/crypto/asymmetric-keys.txt
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _KEYS_ASYMMETRIC_SUBTYPE_H
> --- a/include/keys/asymmetric-type.h
> +++ b/include/keys/asymmetric-type.h
> @@ -1,14 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Asymmetric Public-key cryptography key type interface
>   *
>   * See Documentation/crypto/asymmetric-keys.txt
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _KEYS_ASYMMETRIC_TYPE_H
> --- a/include/keys/request_key_auth-type.h
> +++ b/include/keys/request_key_auth-type.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* request_key authorisation token key type
>   *
>   * Copyright (C) 2005 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _KEYS_REQUEST_KEY_AUTH_TYPE_H
> --- a/include/keys/system_keyring.h
> +++ b/include/keys/system_keyring.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* System keyring containing trusted public keys.
>   *
>   * Copyright (C) 2013 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _KEYS_SYSTEM_KEYRING_H
> --- a/include/linux/asn1.h
> +++ b/include/linux/asn1.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* ASN.1 BER/DER/CER encoding definitions
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _LINUX_ASN1_H
> --- a/include/linux/asn1_ber_bytecode.h
> +++ b/include/linux/asn1_ber_bytecode.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* ASN.1 BER/DER/CER parsing state machine internal definitions
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _LINUX_ASN1_BER_BYTECODE_H
> --- a/include/linux/asn1_decoder.h
> +++ b/include/linux/asn1_decoder.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* ASN.1 decoder
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _LINUX_ASN1_DECODER_H
> --- a/include/linux/assoc_array.h
> +++ b/include/linux/assoc_array.h
> @@ -1,14 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Generic associative array implementation.
>   *
>   * See Documentation/core-api/assoc_array.rst for information.
>   *
>   * Copyright (C) 2013 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _LINUX_ASSOC_ARRAY_H
> --- a/include/linux/assoc_array_priv.h
> +++ b/include/linux/assoc_array_priv.h
> @@ -1,14 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Private definitions for the generic associative array implementation.
>   *
>   * See Documentation/core-api/assoc_array.rst for information.
>   *
>   * Copyright (C) 2013 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _LINUX_ASSOC_ARRAY_PRIV_H
> --- a/include/linux/count_zeros.h
> +++ b/include/linux/count_zeros.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Count leading and trailing zeros functions
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _LINUX_BITOPS_COUNT_ZEROS_H_
> --- a/include/linux/cred.h
> +++ b/include/linux/cred.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Credentials management - see Documentation/security/credentials.rst
>   *
>   * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _LINUX_CRED_H
> --- a/include/linux/fs_context.h
> +++ b/include/linux/fs_context.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Filesystem superblock creation and reconfiguration context.
>   *
>   * Copyright (C) 2018 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _LINUX_FS_CONTEXT_H
> --- a/include/linux/fs_parser.h
> +++ b/include/linux/fs_parser.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Filesystem parameter description and parser
>   *
>   * Copyright (C) 2018 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _LINUX_FS_PARSER_H
> --- a/include/linux/key-type.h
> +++ b/include/linux/key-type.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Definitions for key type implementations
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _LINUX_KEY_TYPE_H
> --- a/include/linux/keyctl.h
> +++ b/include/linux/keyctl.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* keyctl kernel bits
>   *
>   * Copyright (C) 2016 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef __LINUX_KEYCTL_H
> --- a/include/linux/oid_registry.h
> +++ b/include/linux/oid_registry.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* ASN.1 Object identifier (OID) registry
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _LINUX_OID_REGISTRY_H
> --- a/include/linux/verification.h
> +++ b/include/linux/verification.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Signature verification
>   *
>   * Copyright (C) 2014 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _LINUX_VERIFICATION_H
> --- a/include/trace/events/afs.h
> +++ b/include/trace/events/afs.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* AFS tracepoints
>   *
>   * Copyright (C) 2016 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  #undef TRACE_SYSTEM
>  #define TRACE_SYSTEM afs
> --- a/include/trace/events/cachefiles.h
> +++ b/include/trace/events/cachefiles.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* CacheFiles tracepoints
>   *
>   * Copyright (C) 2016 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  #undef TRACE_SYSTEM
>  #define TRACE_SYSTEM cachefiles
> --- a/include/trace/events/fscache.h
> +++ b/include/trace/events/fscache.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* FS-Cache tracepoints
>   *
>   * Copyright (C) 2016 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  #undef TRACE_SYSTEM
>  #define TRACE_SYSTEM fscache
> --- a/include/trace/events/i2c.h
> +++ b/include/trace/events/i2c.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* I2C message transfer tracepoints
>   *
>   * Copyright (C) 2013 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  #undef TRACE_SYSTEM
>  #define TRACE_SYSTEM i2c
> --- a/include/trace/events/rxrpc.h
> +++ b/include/trace/events/rxrpc.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* AF_RXRPC tracepoints
>   *
>   * Copyright (C) 2016 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  #undef TRACE_SYSTEM
>  #define TRACE_SYSTEM rxrpc
> --- a/include/trace/events/smbus.h
> +++ b/include/trace/events/smbus.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* SMBUS message transfer tracepoints
>   *
>   * Copyright (C) 2013 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  #undef TRACE_SYSTEM
>  #define TRACE_SYSTEM smbus
> --- a/include/uapi/linux/rxrpc.h
> +++ b/include/uapi/linux/rxrpc.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Types and definitions for AF_RXRPC.
>   *
>   * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #ifndef _UAPI_LINUX_RXRPC_H
> --- a/kernel/cred.c
> +++ b/kernel/cred.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Task credentials management - see Documentation/security/credentials.rst
>   *
>   * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  #include <linux/export.h>
>  #include <linux/cred.h>
> --- a/kernel/module-internal.h
> +++ b/kernel/module-internal.h
> @@ -1,12 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /* Module internals
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/elf.h>
> --- a/kernel/module_signing.c
> +++ b/kernel/module_signing.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Module signature checker
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/kernel.h>
> --- a/lib/asn1_decoder.c
> +++ b/lib/asn1_decoder.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Decoder for ASN.1 BER/DER/CER encoded bytestream
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/export.h>
> --- a/lib/assoc_array.c
> +++ b/lib/assoc_array.c
> @@ -1,14 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Generic associative array implementation.
>   *
>   * See Documentation/core-api/assoc_array.rst for information.
>   *
>   * Copyright (C) 2013 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  //#define DEBUG
>  #include <linux/rcupdate.h>
> --- a/lib/build_OID_registry
> +++ b/lib/build_OID_registry
> @@ -1,15 +1,11 @@
>  #!/usr/bin/perl -w
> +# SPDX-License-Identifier: GPL-2.0-or-later
>  #
>  # Build a static ASN.1 Object Identified (OID) registry
>  #
>  # Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>  # Written by David Howells (dhowells@redhat.com)
>  #
> -# This program is free software; you can redistribute it and/or
> -# modify it under the terms of the GNU General Public Licence
> -# as published by the Free Software Foundation; either version
> -# 2 of the Licence, or (at your option) any later version.
> -#
>  
>  use strict;
>  
> --- a/lib/is_single_threaded.c
> +++ b/lib/is_single_threaded.c
> @@ -1,13 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Function to determine if a thread group is single threaded or not
>   *
>   * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
>   * - Derived from security/selinux/hooks.c
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  #include <linux/sched/signal.h>
>  #include <linux/sched/task.h>
> --- a/lib/oid_registry.c
> +++ b/lib/oid_registry.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* ASN.1 Object identifier (OID) registry
>   *
>   * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/module.h>
> --- a/net/rxrpc/conn_client.c
> +++ b/net/rxrpc/conn_client.c
> @@ -1,14 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Client connection-specific management code.
>   *
>   * Copyright (C) 2016 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
>   *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
> - *
> - *
>   * Client connections need to be cached for a little while after they've made a
>   * call so as to handle retransmitted DATA packets in case the server didn't
>   * receive the final ACK or terminating ABORT we sent it.
> --- a/net/rxrpc/conn_service.c
> +++ b/net/rxrpc/conn_service.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Service connection management
>   *
>   * Copyright (C) 2016 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/slab.h>
> --- a/net/rxrpc/insecure.c
> +++ b/net/rxrpc/insecure.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Null security operations.
>   *
>   * Copyright (C) 2016 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <net/af_rxrpc.h>
> --- a/net/rxrpc/local_object.c
> +++ b/net/rxrpc/local_object.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Local endpoint object management
>   *
>   * Copyright (C) 2016 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> --- a/net/rxrpc/misc.c
> +++ b/net/rxrpc/misc.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Miscellaneous bits
>   *
>   * Copyright (C) 2016 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/kernel.h>
> --- a/net/rxrpc/net_ns.c
> +++ b/net/rxrpc/net_ns.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* rxrpc network namespace handling.
>   *
>   * Copyright (C) 2017 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/proc_fs.h>
> --- a/net/rxrpc/sendmsg.c
> +++ b/net/rxrpc/sendmsg.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* AF_RXRPC sendmsg() implementation.
>   *
>   * Copyright (C) 2007, 2016 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> --- a/net/rxrpc/sysctl.c
> +++ b/net/rxrpc/sysctl.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* sysctls for configuring RxRPC operating parameters
>   *
>   * Copyright (C) 2014 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/sysctl.h>
> --- a/net/rxrpc/utils.c
> +++ b/net/rxrpc/utils.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Utility routines
>   *
>   * Copyright (C) 2015 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <linux/ip.h>
> --- a/samples/vfs/test-fsmount.c
> +++ b/samples/vfs/test-fsmount.c
> @@ -1,12 +1,8 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* fd-based mount test.
>   *
>   * Copyright (C) 2017 Red Hat, Inc. All Rights Reserved.
>   * Written by David Howells (dhowells@redhat.com)
> - *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public Licence
> - * as published by the Free Software Foundation; either version
> - * 2 of the Licence, or (at your option) any later version.
>   */
>  
>  #include <stdio.h>
> --- a/samples/vfs/test-statx.c
> +++ b/samples/vfs/test-statx.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /* Test the statx() system call.
> 
>