[patch 0/9] treewide: Cleanup recently added license mess

[patch 0/9] treewide: Cleanup recently added license mess

[Thomas Gleixner]

Recently added files or recently added SPDX license identifiers introcuded
license conflicts due to contradicting SPDX license identifiers and boiler
plate text or sloppy license notices.

That's really sad. Quite some people have put a lot of effort into cleaning
up the licensing mess and provided detailed documentation.

It's about time that everyone in the community understands that licensing
is not just an annoyance. It's a really important part of the project and
has legal implication even on the personal level.

The following series addresses recently added crimes. The patches are in a
series but are indenpendent of each other so they are intended to be
applied by the relevant maintainers after thorough review.

Unfortunately we don't have a consistency scanner at the moment. That's a
non trivial problem as the license mess throughout the kernel is horrible
in general. I'm working on a scanner bot which will at least catch newly
added SPDX related inconsistencies. But that will take a while.

Thanks,

	tglx

8<------------
 block/blk-mq-debugfs-zoned.c        |    2 --
 crypto/aegis.h                      |    7 +------
 crypto/aegis128.c                   |    6 +-----
 crypto/aegis128l.c                  |    6 +-----
 crypto/aegis256.c                   |    6 +-----
 crypto/morus1280.c                  |    6 +-----
 crypto/morus640.c                   |    6 +-----
 drivers/vfio/pci/trace.h            |    6 +-----
 drivers/vfio/pci/vfio_pci_nvlink2.c |    6 +-----
 fs/ceph/quota.c                     |   13 -------------
 fs/cifs/trace.c                     |   10 ----------
 fs/cifs/trace.h                     |   10 ----------
 include/crypto/morus1280_glue.h     |    7 +------
 include/crypto/morus640_glue.h      |    7 +------
 include/crypto/morus_common.h       |    7 +------
 tools/bpf/bpftool/json_writer.c     |    7 +------
 tools/bpf/bpftool/json_writer.h     |    7 +------
 17 files changed, 13 insertions(+), 106 deletions(-)

[patch 1/9] block: Cleanup license notice

[Thomas Gleixner]

Remove the imprecise and sloppy:

  "This files is licensed under the GPL."

license notice in the top level comment.

1) The file already contains a SPDX license identifier which clearly
   states that the license of the file is GPL V2 only

2) The notice resolves to GPL v1 or later for scanners which is just
   contrary to the intent of SPDX identifiers to provide clear and non
   ambiguous license information. Aside of that the value add of this
   notice is below zero,

Fixes: 6a5ac9846508 ("block: Make struct request_queue smaller for CONFIG_BLK_DEV_ZONED=n")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Damien Le Moal <damien.lemoal@wdc.com>
Cc: Matias Bjorling <mb@lightnvm.io>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org
---

P.S.: This patch is part of a larger cleanup, but independent of other
      patches and is intended to be picked up by the maintainer directly.

 block/blk-mq-debugfs-zoned.c |    2 --
 1 file changed, 2 deletions(-)

--- a/block/blk-mq-debugfs-zoned.c
+++ b/block/blk-mq-debugfs-zoned.c
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2017 Western Digital Corporation or its affiliates.
- *
- * This file is released under the GPL.
  */
 
 #include <linux/blkdev.h>

Re: [patch 1/9] block: Cleanup license notice

[Bart Van Assche]

On 1/17/19 3:14 PM, Thomas Gleixner wrote:
> Remove the imprecise and sloppy:
> 
>    "This files is licensed under the GPL."
> 
> license notice in the top level comment.
> 
> 1) The file already contains a SPDX license identifier which clearly
>     states that the license of the file is GPL V2 only
> 
> 2) The notice resolves to GPL v1 or later for scanners which is just
>     contrary to the intent of SPDX identifiers to provide clear and non
>     ambiguous license information. Aside of that the value add of this
>     notice is below zero,

My intent was to release this under GPL v2, hence:

Reviewed-by: Bart Van Assche <bvanassche@acm.org>

Re: [patch 1/9] block: Cleanup license notice

[Jens Axboe]

On 1/17/19 4:14 PM, Thomas Gleixner wrote:
> Remove the imprecise and sloppy:
> 
>   "This files is licensed under the GPL."
> 
> license notice in the top level comment.
> 
> 1) The file already contains a SPDX license identifier which clearly
>    states that the license of the file is GPL V2 only
> 
> 2) The notice resolves to GPL v1 or later for scanners which is just
>    contrary to the intent of SPDX identifiers to provide clear and non
>    ambiguous license information. Aside of that the value add of this
>    notice is below zero,

Applied, thanks Thomas.

-- 
Jens Axboe

[patch 2/9] crypto: aegis - Cleanup license mess

[Thomas Gleixner]

Precise and non-ambiguous license information is important. The recently
added aegis header file has a SPDX license identifier, which is nice, but
at the same time it has a contradictionary license boiler plate text.

  SPDX-License-Identifier: GPL-2.0

versus 

  * 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

Oh well.

As the other aegis related files are licensed under the GPL v2 or later,
it's assumed that the boiler plate code is correct, but the SPDX license
identifier is wrong.

Fix the SPDX identifier and remove the boiler plate as it is redundant.

Fixes: f606a88e5823 ("crypto: aegis - Add generic AEGIS AEAD implementations")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ondrej Mosnacek <omosnacek@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
---

P.S.: This patch is part of a larger cleanup, but independent of other
      patches and is intended to be picked up by the maintainer directly.

---
 crypto/aegis.h |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

--- a/crypto/aegis.h
+++ b/crypto/aegis.h
@@ -1,14 +1,9 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * AEGIS common definitions
  *
  * Copyright (c) 2018 Ondrej Mosnacek <omosnacek@gmail.com>
  * Copyright (c) 2018 Red Hat, Inc. 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.
  */
 
 #ifndef _CRYPTO_AEGIS_H

Re: [patch 2/9] crypto: aegis - Cleanup license mess

[Ondrej Mosnáček]

pi 18. 1. 2019 o 0:15 Thomas Gleixner <tglx@linutronix.de> napísal(a):
> Precise and non-ambiguous license information is important. The recently
> added aegis header file has a SPDX license identifier, which is nice, but
> at the same time it has a contradictionary license boiler plate text.
>
>   SPDX-License-Identifier: GPL-2.0
>
> versus
>
>   * 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
>
> Oh well.
>
> As the other aegis related files are licensed under the GPL v2 or later,
> it's assumed that the boiler plate code is correct, but the SPDX license
> identifier is wrong.
>
> Fix the SPDX identifier and remove the boiler plate as it is redundant.
>
> Fixes: f606a88e5823 ("crypto: aegis - Add generic AEGIS AEAD implementations")
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ondrej Mosnacek <omosnacek@gmail.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: linux-crypto@vger.kernel.org

Acked-by: Ondrej Mosnacek <omosnacek@gmail.com>
(feel free to keep the ack also if you decide to switch to the "GPL-2.0+" form)

> ---
>
> P.S.: This patch is part of a larger cleanup, but independent of other
>       patches and is intended to be picked up by the maintainer directly.
>
> ---
>  crypto/aegis.h |    7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
>
> --- a/crypto/aegis.h
> +++ b/crypto/aegis.h
> @@ -1,14 +1,9 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   * AEGIS common definitions
>   *
>   * Copyright (c) 2018 Ondrej Mosnacek <omosnacek@gmail.com>
>   * Copyright (c) 2018 Red Hat, Inc. 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.
>   */
>
>  #ifndef _CRYPTO_AEGIS_H
>
>

Re: [patch 2/9] crypto: aegis - Cleanup license mess

[Herbert Xu]

On Fri, Jan 18, 2019 at 12:14:18AM +0100, Thomas Gleixner wrote:
> Precise and non-ambiguous license information is important. The recently
> added aegis header file has a SPDX license identifier, which is nice, but
> at the same time it has a contradictionary license boiler plate text.
> 
>   SPDX-License-Identifier: GPL-2.0
> 
> versus 
> 
>   * 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
> 
> Oh well.
> 
> As the other aegis related files are licensed under the GPL v2 or later,
> it's assumed that the boiler plate code is correct, but the SPDX license
> identifier is wrong.
> 
> Fix the SPDX identifier and remove the boiler plate as it is redundant.
> 
> Fixes: f606a88e5823 ("crypto: aegis - Add generic AEGIS AEAD implementations")
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ondrej Mosnacek <omosnacek@gmail.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: linux-crypto@vger.kernel.org
> ---
> 
> P.S.: This patch is part of a larger cleanup, but independent of other
>       patches and is intended to be picked up by the maintainer directly.
> 
> ---
>  crypto/aegis.h |    7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)

Patches 2-5 applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

[patch 3/9] crypto: morus - Cleanup license mess

[Thomas Gleixner]

Precise and non-ambiguous license information is important. The recently
added morus header files have a SPDX license identifier, which is nice, but
at the same time they have a contradictionary license boiler plate text.

  SPDX-License-Identifier: GPL-2.0

versus 

  * 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

Oh well.

As the other morus related files are licensed under the GPL v2 or later,
it's assumed that the boiler plate code is correct, but the SPDX license
identifier is wrong.

Fix the SPDX identifier and remove the boiler plate as it is redundant.

Fixes: 56e8e57fc3a7 ("crypto: morus - Add common SIMD glue code for MORUS")
Fixes: 396be41f16fd ("crypto: morus - Add generic MORUS AEAD implementations")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ondrej Mosnacek <omosnacek@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
---

P.S.: This patch is part of a larger cleanup, but independent of other
      patches and is intended to be picked up by the maintainer directly.

---
---
 include/crypto/morus1280_glue.h |    7 +------
 include/crypto/morus640_glue.h  |    7 +------
 include/crypto/morus_common.h   |    7 +------
 3 files changed, 3 insertions(+), 18 deletions(-)

--- a/include/crypto/morus1280_glue.h
+++ b/include/crypto/morus1280_glue.h
@@ -1,15 +1,10 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * The MORUS-1280 Authenticated-Encryption Algorithm
  *   Common glue skeleton -- header file
  *
  * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
  * Copyright (C) 2017-2018 Red Hat, Inc. 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.
  */
 
 #ifndef _CRYPTO_MORUS1280_GLUE_H
--- a/include/crypto/morus640_glue.h
+++ b/include/crypto/morus640_glue.h
@@ -1,15 +1,10 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * The MORUS-640 Authenticated-Encryption Algorithm
  *   Common glue skeleton -- header file
  *
  * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
  * Copyright (C) 2017-2018 Red Hat, Inc. 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.
  */
 
 #ifndef _CRYPTO_MORUS640_GLUE_H
--- a/include/crypto/morus_common.h
+++ b/include/crypto/morus_common.h
@@ -1,15 +1,10 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * The MORUS Authenticated-Encryption Algorithm
  *   Common definitions
  *
  * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
  * Copyright (C) 2017-2018 Red Hat, Inc. 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.
  */
 
 #ifndef _CRYPTO_MORUS_COMMON_H

Re: [patch 3/9] crypto: morus - Cleanup license mess

[Fabio Estevam]

On Thu, Jan 17, 2019 at 9:17 PM Thomas Gleixner <tglx@linutronix.de> wrote:

> --- a/include/crypto/morus1280_glue.h
> +++ b/include/crypto/morus1280_glue.h
> @@ -1,15 +1,10 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0-or-later */

Shouldn't this be: /* SPDX-License-Identifier: GPL-2.0+ */ ?

At least this is the form documented in Documentation/process/license-rules.rst:

" License identifiers for licenses like [L]GPL with the 'or later' option
   are constructed by using a "+" for indicating the 'or later' option.::

      // SPDX-License-Identifier: GPL-2.0+"

Re: [patch 3/9] crypto: morus - Cleanup license mess

[Greg Kroah-Hartman]

On Thu, Jan 17, 2019 at 10:26:07PM -0200, Fabio Estevam wrote:
> On Thu, Jan 17, 2019 at 9:17 PM Thomas Gleixner <tglx@linutronix.de> wrote:
> 
> > --- a/include/crypto/morus1280_glue.h
> > +++ b/include/crypto/morus1280_glue.h
> > @@ -1,15 +1,10 @@
> > -/* SPDX-License-Identifier: GPL-2.0 */
> > +/* SPDX-License-Identifier: GPL-2.0-or-later */
> 
> Shouldn't this be: /* SPDX-License-Identifier: GPL-2.0+ */ ?
> 
> At least this is the form documented in Documentation/process/license-rules.rst:
> 
> " License identifiers for licenses like [L]GPL with the 'or later' option
>    are constructed by using a "+" for indicating the 'or later' option.::
> 
>       // SPDX-License-Identifier: GPL-2.0+"

Either works, please see LICENSES/preferred/GPL-2.0

Personally, I think we should stick with the "+" version as that is the
much more prevalent use in the kernel at the moment, but it's Thomas's
call, not mine.

thanks,

greg k-h

Re: [patch 3/9] crypto: morus - Cleanup license mess

[Ondrej Mosnáček]

pi 18. 1. 2019 o 0:15 Thomas Gleixner <tglx@linutronix.de> napísal(a):
> Precise and non-ambiguous license information is important. The recently
> added morus header files have a SPDX license identifier, which is nice, but
> at the same time they have a contradictionary license boiler plate text.
>
>   SPDX-License-Identifier: GPL-2.0
>
> versus
>
>   * 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
>
> Oh well.
>
> As the other morus related files are licensed under the GPL v2 or later,
> it's assumed that the boiler plate code is correct, but the SPDX license
> identifier is wrong.
>
> Fix the SPDX identifier and remove the boiler plate as it is redundant.

Thanks, I must have copy-pasted the bits from somewhere and didn't
notice the discrepancy...

>
> Fixes: 56e8e57fc3a7 ("crypto: morus - Add common SIMD glue code for MORUS")
> Fixes: 396be41f16fd ("crypto: morus - Add generic MORUS AEAD implementations")
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ondrej Mosnacek <omosnacek@gmail.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: linux-crypto@vger.kernel.org

Acked-by: Ondrej Mosnacek <omosnacek@gmail.com>
(feel free to keep the ack also if you decide to switch to the "GPL-2.0+" form)

> ---
>
> P.S.: This patch is part of a larger cleanup, but independent of other
>       patches and is intended to be picked up by the maintainer directly.
>
> ---
> ---
>  include/crypto/morus1280_glue.h |    7 +------
>  include/crypto/morus640_glue.h  |    7 +------
>  include/crypto/morus_common.h   |    7 +------
>  3 files changed, 3 insertions(+), 18 deletions(-)
>
> --- a/include/crypto/morus1280_glue.h
> +++ b/include/crypto/morus1280_glue.h
> @@ -1,15 +1,10 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   * The MORUS-1280 Authenticated-Encryption Algorithm
>   *   Common glue skeleton -- header file
>   *
>   * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
>   * Copyright (C) 2017-2018 Red Hat, Inc. 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.
>   */
>
>  #ifndef _CRYPTO_MORUS1280_GLUE_H
> --- a/include/crypto/morus640_glue.h
> +++ b/include/crypto/morus640_glue.h
> @@ -1,15 +1,10 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   * The MORUS-640 Authenticated-Encryption Algorithm
>   *   Common glue skeleton -- header file
>   *
>   * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
>   * Copyright (C) 2017-2018 Red Hat, Inc. 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.
>   */
>
>  #ifndef _CRYPTO_MORUS640_GLUE_H
> --- a/include/crypto/morus_common.h
> +++ b/include/crypto/morus_common.h
> @@ -1,15 +1,10 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   * The MORUS Authenticated-Encryption Algorithm
>   *   Common definitions
>   *
>   * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
>   * Copyright (C) 2017-2018 Red Hat, Inc. 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.
>   */
>
>  #ifndef _CRYPTO_MORUS_COMMON_H
>
>

[patch 4/9] crypto: aegis - Convert to SPDX license identifiers

[Thomas Gleixner]

The license boiler plate text is not ideal for machine parsing. The kernel
uses SPDX license identifiers for that purpose, which replace the boiler
plate text.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ondrej Mosnacek <omosnacek@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
---

P.S.: This patch is part of a larger cleanup, but independent of other
      patches and is intended to be picked up by the maintainer directly. 

---
 crypto/aegis128.c  |    6 +-----
 crypto/aegis128l.c |    6 +-----
 crypto/aegis256.c  |    6 +-----
 3 files changed, 3 insertions(+), 15 deletions(-)

--- a/crypto/aegis128.c
+++ b/crypto/aegis128.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * The AEGIS-128 Authenticated-Encryption Algorithm
  *
  * Copyright (c) 2017-2018 Ondrej Mosnacek <omosnacek@gmail.com>
  * Copyright (C) 2017-2018 Red Hat, Inc. 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.
  */
 
 #include <crypto/algapi.h>
--- a/crypto/aegis128l.c
+++ b/crypto/aegis128l.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * The AEGIS-128L Authenticated-Encryption Algorithm
  *
  * Copyright (c) 2017-2018 Ondrej Mosnacek <omosnacek@gmail.com>
  * Copyright (C) 2017-2018 Red Hat, Inc. 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.
  */
 
 #include <crypto/algapi.h>
--- a/crypto/aegis256.c
+++ b/crypto/aegis256.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * The AEGIS-256 Authenticated-Encryption Algorithm
  *
  * Copyright (c) 2017-2018 Ondrej Mosnacek <omosnacek@gmail.com>
  * Copyright (C) 2017-2018 Red Hat, Inc. 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.
  */
 
 #include <crypto/algapi.h>

Re: [patch 4/9] crypto: aegis - Convert to SPDX license identifiers

[Ondrej Mosnáček]

pi 18. 1. 2019 o 0:15 Thomas Gleixner <tglx@linutronix.de> napísal(a):
> The license boiler plate text is not ideal for machine parsing. The kernel
> uses SPDX license identifiers for that purpose, which replace the boiler
> plate text.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ondrej Mosnacek <omosnacek@gmail.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: linux-crypto@vger.kernel.org

Acked-by: Ondrej Mosnacek <omosnacek@gmail.com>
(feel free to keep the ack also if you decide to switch to the "GPL-2.0+" form)

> ---
>
> P.S.: This patch is part of a larger cleanup, but independent of other
>       patches and is intended to be picked up by the maintainer directly.
>
> ---
>  crypto/aegis128.c  |    6 +-----
>  crypto/aegis128l.c |    6 +-----
>  crypto/aegis256.c  |    6 +-----
>  3 files changed, 3 insertions(+), 15 deletions(-)
>
> --- a/crypto/aegis128.c
> +++ b/crypto/aegis128.c
> @@ -1,13 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * The AEGIS-128 Authenticated-Encryption Algorithm
>   *
>   * Copyright (c) 2017-2018 Ondrej Mosnacek <omosnacek@gmail.com>
>   * Copyright (C) 2017-2018 Red Hat, Inc. 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.
>   */
>
>  #include <crypto/algapi.h>
> --- a/crypto/aegis128l.c
> +++ b/crypto/aegis128l.c
> @@ -1,13 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * The AEGIS-128L Authenticated-Encryption Algorithm
>   *
>   * Copyright (c) 2017-2018 Ondrej Mosnacek <omosnacek@gmail.com>
>   * Copyright (C) 2017-2018 Red Hat, Inc. 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.
>   */
>
>  #include <crypto/algapi.h>
> --- a/crypto/aegis256.c
> +++ b/crypto/aegis256.c
> @@ -1,13 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * The AEGIS-256 Authenticated-Encryption Algorithm
>   *
>   * Copyright (c) 2017-2018 Ondrej Mosnacek <omosnacek@gmail.com>
>   * Copyright (C) 2017-2018 Red Hat, Inc. 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.
>   */
>
>  #include <crypto/algapi.h>
>
>

[patch 5/9] crypto: morus - Convert to SPDX license identifiers

[Thomas Gleixner]

The license boiler plate text is not ideal for machine parsing. The kernel
uses SPDX license identifiers for that purpose, which replace the boiler
plate text.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ondrej Mosnacek <omosnacek@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
---

P.S.: This patch is part of a larger cleanup, but independent of other
      patches and is intended to be picked up by the maintainer directly. 

---
 crypto/morus1280.c |    6 +-----
 crypto/morus640.c  |    6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

--- a/crypto/morus1280.c
+++ b/crypto/morus1280.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * The MORUS-1280 Authenticated-Encryption Algorithm
  *
  * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
  * Copyright (C) 2017-2018 Red Hat, Inc. 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.
  */
 
 #include <asm/unaligned.h>
--- a/crypto/morus640.c
+++ b/crypto/morus640.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * The MORUS-640 Authenticated-Encryption Algorithm
  *
  * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
  * Copyright (C) 2017-2018 Red Hat, Inc. 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.
  */
 
 #include <asm/unaligned.h>

Re: [patch 5/9] crypto: morus - Convert to SPDX license identifiers

[Ondrej Mosnáček]

pi 18. 1. 2019 o 0:15 Thomas Gleixner <tglx@linutronix.de> napísal(a):
> The license boiler plate text is not ideal for machine parsing. The kernel
> uses SPDX license identifiers for that purpose, which replace the boiler
> plate text.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ondrej Mosnacek <omosnacek@gmail.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: linux-crypto@vger.kernel.org

Acked-by: Ondrej Mosnacek <omosnacek@gmail.com>
(feel free to keep the ack also if you decide to switch to the "GPL-2.0+" form)

> ---
>
> P.S.: This patch is part of a larger cleanup, but independent of other
>       patches and is intended to be picked up by the maintainer directly.
>
> ---
>  crypto/morus1280.c |    6 +-----
>  crypto/morus640.c  |    6 +-----
>  2 files changed, 2 insertions(+), 10 deletions(-)
>
> --- a/crypto/morus1280.c
> +++ b/crypto/morus1280.c
> @@ -1,13 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * The MORUS-1280 Authenticated-Encryption Algorithm
>   *
>   * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
>   * Copyright (C) 2017-2018 Red Hat, Inc. 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.
>   */
>
>  #include <asm/unaligned.h>
> --- a/crypto/morus640.c
> +++ b/crypto/morus640.c
> @@ -1,13 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * The MORUS-640 Authenticated-Encryption Algorithm
>   *
>   * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
>   * Copyright (C) 2017-2018 Red Hat, Inc. 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.
>   */
>
>  #include <asm/unaligned.h>
>
>

[patch 6/9] ceph: quota: Cleanup license mess

[Thomas Gleixner]

Precise and non-ambiguous license information is important. The recently
added aegis header file has a SPDX license identifier, which is nice, but
at the same time it has a contradictionary license boiler plate text.

  SPDX-License-Identifier: GPL-2.0

versus 

  * 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.

Oh well.

As the other ceph related files are licensed under the GPL v2 only, it's
assumed that the SPDX id is correct and the boiler plate was randomly
copied into that patch.

Remove the boiler plate as it is wrong and even if correct it is redundant.

Fixes: fb18a57568c2 ("ceph: quota: add initial infrastructure to support cephfs quotas")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Luis Henriques <lhenriques@suse.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: "Yan, Zheng" <zyan@redhat.com>
Cc: Sage Weil <sage@redhat.com>
Cc: Ilya Dryomov <idryomov@gmail.com>
Cc: ceph-devel@vger.kernel.org
---

P.S.: This patch is part of a larger cleanup, but independent of other
      patches and is intended to be picked up by the maintainer directly.

---
 fs/ceph/quota.c |   13 -------------
 1 file changed, 13 deletions(-)

--- a/fs/ceph/quota.c
+++ b/fs/ceph/quota.c
@@ -3,19 +3,6 @@
  * quota.c - CephFS quota
  *
  * Copyright (C) 2017-2018 SUSE
- *
- * 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, see <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/statfs.h>

Re: [patch 6/9] ceph: quota: Cleanup license mess

[Luis Henriques]

Thomas Gleixner <tglx@linutronix.de> writes:

> Precise and non-ambiguous license information is important. The recently
> added aegis header file has a SPDX license identifier, which is nice, but
> at the same time it has a contradictionary license boiler plate text.
>
>   SPDX-License-Identifier: GPL-2.0
>
> versus 
>
>   * 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.
>
> Oh well.
>
> As the other ceph related files are licensed under the GPL v2 only, it's
> assumed that the SPDX id is correct and the boiler plate was randomly
> copied into that patch.
>
> Remove the boiler plate as it is wrong and even if correct it is redundant.
>
> Fixes: fb18a57568c2 ("ceph: quota: add initial infrastructure to support cephfs quotas")
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Luis Henriques <lhenriques@suse.com>
> Cc: Jiri Kosina <jkosina@suse.cz>
> Cc: "Yan, Zheng" <zyan@redhat.com>
> Cc: Sage Weil <sage@redhat.com>
> Cc: Ilya Dryomov <idryomov@gmail.com>
> Cc: ceph-devel@vger.kernel.org

Thanks, Thomas.  Fell free to add my

Acked-by: Luis Henriques <lhenriques@suse.com>

Cheers,
-- 
Luis


> ---
>
> P.S.: This patch is part of a larger cleanup, but independent of other
>       patches and is intended to be picked up by the maintainer directly.
>
> ---
>  fs/ceph/quota.c |   13 -------------
>  1 file changed, 13 deletions(-)
>
> --- a/fs/ceph/quota.c
> +++ b/fs/ceph/quota.c
> @@ -3,19 +3,6 @@
>   * quota.c - CephFS quota
>   *
>   * Copyright (C) 2017-2018 SUSE
> - *
> - * 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, see <http://www.gnu.org/licenses/>.
>   */
>  
>  #include <linux/statfs.h>
>
>
>

Re: [patch 6/9] ceph: quota: Cleanup license mess

[Ilya Dryomov]

On Fri, Jan 18, 2019 at 12:15 AM Thomas Gleixner <tglx@linutronix.de> wrote:
>
> Precise and non-ambiguous license information is important. The recently
> added aegis header file has a SPDX license identifier, which is nice, but

Looks like cut-and-paste from crypto/aegis.h patch?

I'm changing this to say "recently added quota.c file".

> at the same time it has a contradictionary license boiler plate text.
>
>   SPDX-License-Identifier: GPL-2.0
>
> versus
>
>   * 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.
>
> Oh well.
>
> As the other ceph related files are licensed under the GPL v2 only, it's
> assumed that the SPDX id is correct and the boiler plate was randomly
> copied into that patch.
>
> Remove the boiler plate as it is wrong and even if correct it is redundant.
>
> Fixes: fb18a57568c2 ("ceph: quota: add initial infrastructure to support cephfs quotas")
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Luis Henriques <lhenriques@suse.com>
> Cc: Jiri Kosina <jkosina@suse.cz>
> Cc: "Yan, Zheng" <zyan@redhat.com>
> Cc: Sage Weil <sage@redhat.com>
> Cc: Ilya Dryomov <idryomov@gmail.com>
> Cc: ceph-devel@vger.kernel.org
> ---
>
> P.S.: This patch is part of a larger cleanup, but independent of other
>       patches and is intended to be picked up by the maintainer directly.
>
> ---
>  fs/ceph/quota.c |   13 -------------
>  1 file changed, 13 deletions(-)
>
> --- a/fs/ceph/quota.c
> +++ b/fs/ceph/quota.c
> @@ -3,19 +3,6 @@
>   * quota.c - CephFS quota
>   *
>   * Copyright (C) 2017-2018 SUSE
> - *
> - * 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, see <http://www.gnu.org/licenses/>.
>   */
>
>  #include <linux/statfs.h>

Applied.

Thanks,

                Ilya

Re: [patch 6/9] ceph: quota: Cleanup license mess

[Thomas Gleixner]

On Fri, 18 Jan 2019, Ilya Dryomov wrote:

> On Fri, Jan 18, 2019 at 12:15 AM Thomas Gleixner <tglx@linutronix.de> wrote:
> >
> > Precise and non-ambiguous license information is important. The recently
> > added aegis header file has a SPDX license identifier, which is nice, but
> 
> Looks like cut-and-paste from crypto/aegis.h patch?

Oops, sorry.

> I'm changing this to say "recently added quota.c file".

Thank you!

      tglx

[patch 7/9] smb3: Cleanup license mess

[Thomas Gleixner]

Precise and non-ambiguous license information is important. The recently
added aegis header file has a SPDX license identifier, which is nice, but
at the same time it has a contradictionary license boiler plate text.

  SPDX-License-Identifier: GPL-2.0

versus 

  *   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.

Oh well.

Assuming that the SPDX identifier is correct and according to x86/hyper-v
contributions from Microsoft GPL V2 only is the usual license.

Remove the boiler plate as it is wrong and even if correct it is redundant.

Fixes: eccb4422cf97 ("smb3: Add ftrace tracepoints for improved SMB3 debugging")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Steve French <sfrench@samba.org>
Cc: linux-cifs@vger.kernel.org
---

P.S.: This patch is part of a larger cleanup, but independent of other
      patches and is intended to be picked up by the maintainer directly.

---
 fs/cifs/trace.c |   10 ----------
 fs/cifs/trace.h |   10 ----------
 2 files changed, 20 deletions(-)

--- a/fs/cifs/trace.c
+++ b/fs/cifs/trace.c
@@ -3,16 +3,6 @@
  *   Copyright (C) 2018, Microsoft Corporation.
  *
  *   Author(s): Steve French <stfrench@microsoft.com>
- *
- *   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.
  */
 #define CREATE_TRACE_POINTS
 #include "trace.h"
--- a/fs/cifs/trace.h
+++ b/fs/cifs/trace.h
@@ -3,16 +3,6 @@
  *   Copyright (C) 2018, Microsoft Corporation.
  *
  *   Author(s): Steve French <stfrench@microsoft.com>
- *
- *   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.
  */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM cifs

Re: [patch 7/9] smb3: Cleanup license mess

[Steve French]

merged into cifs-2.6.git for-next

On Thu, Jan 17, 2019 at 5:17 PM Thomas Gleixner <tglx@linutronix.de> wrote:
>
> Precise and non-ambiguous license information is important. The recently
> added aegis header file has a SPDX license identifier, which is nice, but
> at the same time it has a contradictionary license boiler plate text.
>
>   SPDX-License-Identifier: GPL-2.0
>
> versus
>
>   *   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.
>
> Oh well.
>
> Assuming that the SPDX identifier is correct and according to x86/hyper-v
> contributions from Microsoft GPL V2 only is the usual license.
>
> Remove the boiler plate as it is wrong and even if correct it is redundant.
>
> Fixes: eccb4422cf97 ("smb3: Add ftrace tracepoints for improved SMB3 debugging")
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Steve French <sfrench@samba.org>
> Cc: linux-cifs@vger.kernel.org
> ---
>
> P.S.: This patch is part of a larger cleanup, but independent of other
>       patches and is intended to be picked up by the maintainer directly.
>
> ---
>  fs/cifs/trace.c |   10 ----------
>  fs/cifs/trace.h |   10 ----------
>  2 files changed, 20 deletions(-)
>
> --- a/fs/cifs/trace.c
> +++ b/fs/cifs/trace.c
> @@ -3,16 +3,6 @@
>   *   Copyright (C) 2018, Microsoft Corporation.
>   *
>   *   Author(s): Steve French <stfrench@microsoft.com>
> - *
> - *   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.
>   */
>  #define CREATE_TRACE_POINTS
>  #include "trace.h"
> --- a/fs/cifs/trace.h
> +++ b/fs/cifs/trace.h
> @@ -3,16 +3,6 @@
>   *   Copyright (C) 2018, Microsoft Corporation.
>   *
>   *   Author(s): Steve French <stfrench@microsoft.com>
> - *
> - *   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.
>   */
>  #undef TRACE_SYSTEM
>  #define TRACE_SYSTEM cifs
>
>


-- 
Thanks,

Steve

[patch 8/9] tools: bpftool: Cleanup license mess

[Thomas Gleixner]

Precise and non-ambiguous license information is important. The recent
relicensing of the bpftools introduced a license conflict.

The files have now:

     SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause

and

     * 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

Amazingly about 20 people acked that change and neither they nor the
committer noticed. Oh well.

Digging deeper: The files were imported from the iproute2 repository with
the GPL V2 or later boiler plate text in commit b66e907cfee2 ("tools:
bpftool: copy JSON writer from iproute2 repository")

Looking at the iproute2 repository at

  git://git.kernel.org/pub/scm/network/iproute2/iproute2.git

the following commit is the equivivalent:

  commit d9d8c839 ("json_writer: add SPDX Identifier (GPL-2/BSD-2)")

That commit explicitly removes the boiler plate and relicenses the code
uner GPL-2.0-only and BSD-2-Clause. As Steven wrote the original code and
also the relicensing commit, it's assumed that the relicensing was intended
to do exaclty that. Just the kernel side update failed to remove the boiler
plate. Do so now.

Fixes: 907b22365115 ("tools: bpftool: dual license all files")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
Cc: Roman Gushchin <guro@fb.com>
Cc: YueHaibing <yuehaibing@huawei.com>
Cc: Yonghong Song <yhs@fb.com>
Cc: Stanislav Fomichev <sdf@google.com>
Cc: Sean Young <sean@mess.org>
Cc: Jiri Benc <jbenc@redhat.com>
Cc: David Calavera <david.calavera@gmail.com>
Cc: Andrey Ignatov <rdna@fb.com>
Cc: Joe Stringer <joe@wand.net.nz>
Cc: David Ahern <dsahern@gmail.com>
Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Petar Penkov <ppenkov@stanford.edu>
Cc: Sandipan Das <sandipan@linux.ibm.com>
Cc: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Taeung Song <treeze.taeung@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Quentin Monnet <quentin.monnet@netronome.com>
CC: okash.khawaja@gmail.com
Cc: netdev@vger.kernel.org
---

P.S.: This patch is part of a larger cleanup, but independent of other
      patches and is intended to be picked up by the maintainer directly.

---
 tools/bpf/bpftool/json_writer.c |    7 +------
 tools/bpf/bpftool/json_writer.h |    5 -----
 2 files changed, 1 insertion(+), 11 deletions(-)

--- a/tools/bpf/bpftool/json_writer.c
+++ b/tools/bpf/bpftool/json_writer.c
@@ -1,15 +1,10 @@
-// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
 /*
  * Simple streaming JSON writer
  *
  * This takes care of the annoying bits of JSON syntax like the commas
  * after elements
  *
- * 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.
- *
  * Authors:	Stephen Hemminger <stephen@networkplumber.org>
  */
 
--- a/tools/bpf/bpftool/json_writer.h
+++ b/tools/bpf/bpftool/json_writer.h
@@ -5,11 +5,6 @@
  * This takes care of the annoying bits of JSON syntax like the commas
  * after elements
  *
- * 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.
- *
  * Authors:	Stephen Hemminger <stephen@networkplumber.org>
  */
 

Re: [patch 8/9] tools: bpftool: Cleanup license mess

[Jakub Kicinski]

On Fri, 18 Jan 2019 00:14:24 +0100, Thomas Gleixner wrote:
> Precise and non-ambiguous license information is important. The recent
> relicensing of the bpftools introduced a license conflict.
> 
> The files have now:
> 
>      SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause
> 
> and
> 
>      * 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
> 
> Amazingly about 20 people acked that change and neither they nor the
> committer noticed. Oh well.

Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>

Sorry about that!  

These files as you found out are from Stephen, so we probably don't
need the full litany of acks.

Re: [patch 8/9] tools: bpftool: Cleanup license mess

[Thomas Gleixner]

On Thu, 17 Jan 2019, Jakub Kicinski wrote:

> On Fri, 18 Jan 2019 00:14:24 +0100, Thomas Gleixner wrote:
> > Precise and non-ambiguous license information is important. The recent
> > relicensing of the bpftools introduced a license conflict.
> > 
> > The files have now:
> > 
> >      SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause
> > 
> > and
> > 
> >      * 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
> > 
> > Amazingly about 20 people acked that change and neither they nor the
> > committer noticed. Oh well.
> 
> Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
> 
> Sorry about that!  
> 
> These files as you found out are from Stephen, so we probably don't
> need the full litany of acks.

I agree. I cc'ed everyone just to make them aware that licensing is not
just an annoyance. It's a important part of the project and it has legal
implications - in the worst case on the personal level. We already have an
unholy mess in that area, so we really need everybody to take it serious.

Thanks,

	tglx

Re: [patch 8/9] tools: bpftool: Cleanup license mess

[Alexei Starovoitov]

On Fri, Jan 18, 2019 at 12:14:24AM +0100, Thomas Gleixner wrote:
> Precise and non-ambiguous license information is important. The recent
> relicensing of the bpftools introduced a license conflict.
> 
> The files have now:
> 
>      SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause
> 
> and
> 
>      * 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
> 
> Amazingly about 20 people acked that change and neither they nor the
> committer noticed. Oh well.
> 
> Digging deeper: The files were imported from the iproute2 repository with
> the GPL V2 or later boiler plate text in commit b66e907cfee2 ("tools:
> bpftool: copy JSON writer from iproute2 repository")
> 
> Looking at the iproute2 repository at
> 
>   git://git.kernel.org/pub/scm/network/iproute2/iproute2.git
> 
> the following commit is the equivivalent:
> 
>   commit d9d8c839 ("json_writer: add SPDX Identifier (GPL-2/BSD-2)")
> 
> That commit explicitly removes the boiler plate and relicenses the code
> uner GPL-2.0-only and BSD-2-Clause. As Steven wrote the original code and
> also the relicensing commit, it's assumed that the relicensing was intended
> to do exaclty that. Just the kernel side update failed to remove the boiler
> plate. Do so now.
> 
> Fixes: 907b22365115 ("tools: bpftool: dual license all files")
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
> Cc: Roman Gushchin <guro@fb.com>
> Cc: YueHaibing <yuehaibing@huawei.com>
> Cc: Yonghong Song <yhs@fb.com>
> Cc: Stanislav Fomichev <sdf@google.com>
> Cc: Sean Young <sean@mess.org>
> Cc: Jiri Benc <jbenc@redhat.com>
> Cc: David Calavera <david.calavera@gmail.com>
> Cc: Andrey Ignatov <rdna@fb.com>
> Cc: Joe Stringer <joe@wand.net.nz>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>
> Cc: Petar Penkov <ppenkov@stanford.edu>
> Cc: Sandipan Das <sandipan@linux.ibm.com>
> Cc: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
> Cc: Stephen Hemminger <stephen@networkplumber.org>
> Cc: John Fastabend <john.fastabend@gmail.com>
> Cc: Taeung Song <treeze.taeung@gmail.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Daniel Borkmann <daniel@iogearbox.net>
> Cc: Quentin Monnet <quentin.monnet@netronome.com>
> CC: okash.khawaja@gmail.com
> Cc: netdev@vger.kernel.org
> ---
> 
> P.S.: This patch is part of a larger cleanup, but independent of other
>       patches and is intended to be picked up by the maintainer directly.

Applied this patch to bpf tree.
Sorry about this mess.

[patch 9/9] vfio/pci: Cleanup license mess

[Thomas Gleixner]

The recently added nvlink2 VFIO driver introduced a license conflict in two
files. In both cases the SPDX license identifier is:

  SPDX-License-Identifier: GPL-2.0+

but the files contain also the following license boiler plate text:

  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation

The latter is GPL-2.9-only and not GPL-2.0=.

Looking deeper. The nvlink source file is derived from vfio_pci_igd.c which
is also licensed under GPL-2.0-only and it can be assumed that the file was
copied and modified. As the original file is licensed GPL-2.0-only it's not
possible to relicense derivative work to GPL-2.0-or-later.

Fix the SPDX identifier and remove the boiler plate as it is redundant.

Fixes: 7f92891778df ("vfio_pci: Add NVIDIA GV100GL [Tesla V100 SXM2] subdriver")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: kvm@vger.kernel.org
---

P.S.: This patch is part of a larger cleanup, but independent of other
      patches and is intended to be picked up by the maintainer directly.

---
 drivers/vfio/pci/trace.h            |    6 +-----
 drivers/vfio/pci/vfio_pci_nvlink2.c |    6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

--- a/drivers/vfio/pci/trace.h
+++ b/drivers/vfio/pci/trace.h
@@ -1,13 +1,9 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * VFIO PCI mmap/mmap_fault tracepoints
  *
  * Copyright (C) 2018 IBM Corp.  All rights reserved.
  *     Author: Alexey Kardashevskiy <aik@ozlabs.ru>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 
 #undef TRACE_SYSTEM
--- a/drivers/vfio/pci/vfio_pci_nvlink2.c
+++ b/drivers/vfio/pci/vfio_pci_nvlink2.c
@@ -1,14 +1,10 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * VFIO PCI NVIDIA Whitherspoon GPU support a.k.a. NVLink2.
  *
  * Copyright (C) 2018 IBM Corp.  All rights reserved.
  *     Author: Alexey Kardashevskiy <aik@ozlabs.ru>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
  * Register an on-GPU RAM region for cacheable access.
  *
  * Derived from original vfio_pci_igd.c:

Re: [patch 9/9] vfio/pci: Cleanup license mess

[Alex Williamson]

On Fri, 18 Jan 2019 00:14:25 +0100
Thomas Gleixner <tglx@linutronix.de> wrote:

> The recently added nvlink2 VFIO driver introduced a license conflict in two
> files. In both cases the SPDX license identifier is:
> 
>   SPDX-License-Identifier: GPL-2.0+
> 
> but the files contain also the following license boiler plate text:
> 
>   * This program is free software; you can redistribute it and/or modify
>   * it under the terms of the GNU General Public License version 2 as
>   * published by the Free Software Foundation
> 
> The latter is GPL-2.9-only and not GPL-2.0=.
> 
> Looking deeper. The nvlink source file is derived from vfio_pci_igd.c which
> is also licensed under GPL-2.0-only and it can be assumed that the file was
> copied and modified. As the original file is licensed GPL-2.0-only it's not
> possible to relicense derivative work to GPL-2.0-or-later.
> 
> Fix the SPDX identifier and remove the boiler plate as it is redundant.
> 
> Fixes: 7f92891778df ("vfio_pci: Add NVIDIA GV100GL [Tesla V100 SXM2] subdriver")
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
> Cc: Alex Williamson <alex.williamson@redhat.com>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: kvm@vger.kernel.org
> ---
> 
> P.S.: This patch is part of a larger cleanup, but independent of other
>       patches and is intended to be picked up by the maintainer directly.

Applied to vfio for-linus branch for v5.0.  Thanks,

Alex


> ---
>  drivers/vfio/pci/trace.h            |    6 +-----
>  drivers/vfio/pci/vfio_pci_nvlink2.c |    6 +-----
>  2 files changed, 2 insertions(+), 10 deletions(-)
> 
> --- a/drivers/vfio/pci/trace.h
> +++ b/drivers/vfio/pci/trace.h
> @@ -1,13 +1,9 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> +/* SPDX-License-Identifier: GPL-2.0-only */
>  /*
>   * VFIO PCI mmap/mmap_fault tracepoints
>   *
>   * Copyright (C) 2018 IBM Corp.  All rights reserved.
>   *     Author: Alexey Kardashevskiy <aik@ozlabs.ru>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
>   */
>  
>  #undef TRACE_SYSTEM
> --- a/drivers/vfio/pci/vfio_pci_nvlink2.c
> +++ b/drivers/vfio/pci/vfio_pci_nvlink2.c
> @@ -1,14 +1,10 @@
> -// SPDX-License-Identifier: GPL-2.0+
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * VFIO PCI NVIDIA Whitherspoon GPU support a.k.a. NVLink2.
>   *
>   * Copyright (C) 2018 IBM Corp.  All rights reserved.
>   *     Author: Alexey Kardashevskiy <aik@ozlabs.ru>
>   *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - *
>   * Register an on-GPU RAM region for cacheable access.
>   *
>   * Derived from original vfio_pci_igd.c:
> 
>