From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 750B6C433F5 for ; Thu, 10 Feb 2022 16:16:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243723AbiBJQQZ (ORCPT ); Thu, 10 Feb 2022 11:16:25 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:36874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239586AbiBJQQZ (ORCPT ); Thu, 10 Feb 2022 11:16:25 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A35F5397; Thu, 10 Feb 2022 08:16:25 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 58B03B825DD; Thu, 10 Feb 2022 16:16:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7930EC340EF; Thu, 10 Feb 2022 16:16:22 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="V+g4r9F9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1644509780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9I0qD8KXVzB7y9iuCvHjhczkFADpUoCENN0N+xnAAQM=; b=V+g4r9F9WYAYYjuvgVlB0AvyUYxZMs0nVeM8ljOpFOURTwSoLTrQ4/VeRTAg20jy0sXLNU cq113YTMuVP5MQxTfz0TE5fc3B4HJWhKCa0J+s+oNhyKUyxdF7zYjbcLtBa4SpCLIS6K4h xjv26jU7iCKiYqnmA+eRBVEPEVxQCbM= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 84aa04f5 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Thu, 10 Feb 2022 16:16:19 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-kernel@vger.kernel.org, linux-spdx@vger.kernel.org Cc: "Jason A. Donenfeld" , Thomas Gleixner , Greg Kroah-Hartman , Theodore Ts'o , Dominik Brodowski Subject: [PATCH v2] random: add proper SPDX header Date: Thu, 10 Feb 2022 17:16:11 +0100 Message-Id: <20220210161611.157765-1-Jason@zx2c4.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-spdx@vger.kernel.org Somehow this file missed the SPDXification efforts several years ago. Convert the current license into "(GPL-2.0-or-later OR BSD-3-Clause)". Cc: Thomas Gleixner Cc: Greg Kroah-Hartman Cc: Theodore Ts'o Cc: Dominik Brodowski Signed-off-by: Jason A. Donenfeld --- 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. 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 . All Rights Reserved. - * * Copyright Matt Mackall , 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. - * - * 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.) - * - * 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. */ /* 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. - */ #ifndef _LINUX_RANDOM_H #define _LINUX_RANDOM_H -- 2.35.0