On Thu, Feb 10, 2022 at 05:16:11PM +0100, Jason A. Donenfeld wrote: > Somehow this file missed the SPDXification efforts several years ago. That is because it required manual review. > Convert the current license into "(GPL-2.0-or-later OR BSD-3-Clause)". > > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Cc: Theodore Ts'o <tytso@xxxxxxx> > Cc: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx> > Signed-off-by: Jason A. Donenfeld <Jason@xxxxxxxxx> > --- > Hi SPDX List, > > I think I got this conversion right, but I would certainly appreciate a > review on this from somebody with more legal expertise than me. Where did the "or later" come from? I don't see that in the original text. > > Thanks, > Jason > > drivers/char/random.c | 40 ++-------------------------------------- > include/linux/random.h | 5 ----- > 2 files changed, 2 insertions(+), 43 deletions(-) > > diff --git a/drivers/char/random.c b/drivers/char/random.c > index 324574b03120..a2bbae5a693d 100644 > --- a/drivers/char/random.c > +++ b/drivers/char/random.c > @@ -1,44 +1,8 @@ > +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) > /* > - * random.c -- A strong random number generator > - * > * Copyright (C) 2017-2022 Jason A. Donenfeld <Jason@xxxxxxxxx>. All Rights Reserved. > - * > * Copyright Matt Mackall <mpm@xxxxxxxxxxx>, 2003, 2004, 2005 > - * > - * Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All > - * rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, and the entire permission notice in its entirety, > - * including the disclaimer of warranties. > - * 2. Redistributions in binary form must reproduce the above copyright > - * notice, this list of conditions and the following disclaimer in the > - * documentation and/or other materials provided with the distribution. > - * 3. The name of the author may not be used to endorse or promote > - * products derived from this software without specific prior > - * written permission. BSD-3, great. > - * > - * ALTERNATIVELY, this product may be distributed under the terms of > - * the GNU General Public License, in which case the provisions of the GPL are > - * required INSTEAD OF the above restrictions. (This clause is > - * necessary due to a potential bad interaction between the GPL and > - * the restrictions contained in a BSD-style copyright.) I do not see a "or later" here. > - * > - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED > - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES > - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF > - * WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE > - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT > - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR > - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF > - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE > - * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH > - * DAMAGE. > + * Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All rights reserved. Why break the line-wrap? > */ > > /* > diff --git a/include/linux/random.h b/include/linux/random.h > index e92efb39779c..1a6861aa1277 100644 > --- a/include/linux/random.h > +++ b/include/linux/random.h > @@ -1,9 +1,4 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > -/* > - * include/linux/random.h > - * > - * Include file for the random number generator. > - */ This doesn't have to do with the SPDX change in the other file, it belongs in a different patch, sorry. thanks, greg k-h
