On Sat, Jun 10, 2023 at 3:31 AM Bagas Sanjaya <bagasdotme@xxxxxxxxx> wrote: > > [also Cc'ing Richard] > > On Tue, Jun 06, 2023 at 07:31:26PM +0200, Ard Biesheuvel wrote: > > Add some missing SPDX headers, and drop the associated boilerplate > > license text to/from the ARM implementations of ChaCha, CRC-32 and > > CRC-T10DIF. > > > > Signed-off-by: Ard Biesheuvel <ardb@xxxxxxxxxx> > > --- > > arch/arm/crypto/chacha-neon-core.S | 10 +---- > > arch/arm/crypto/crc32-ce-core.S | 30 ++------------- > > arch/arm/crypto/crct10dif-ce-core.S | 40 +------------------- > > 3 files changed, 5 insertions(+), 75 deletions(-) > > > > diff --git a/arch/arm/crypto/chacha-neon-core.S b/arch/arm/crypto/chacha-neon-core.S > > index 13d12f672656bb8d..46d708118ef948ec 100644 > > --- a/arch/arm/crypto/chacha-neon-core.S > > +++ b/arch/arm/crypto/chacha-neon-core.S > > @@ -1,21 +1,13 @@ > > +/* SPDX-License-Identifier: GPL-2.0-only */ > > /* > > * ChaCha/XChaCha NEON helper functions > > * > > * Copyright (C) 2016 Linaro, Ltd. <ard.biesheuvel@xxxxxxxxxx> > > * > > - * 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. > > - * > > * Based on: > > * ChaCha20 256-bit cipher algorithm, RFC7539, x64 SSE3 functions > > * > > * Copyright (C) 2015 Martin Willi > > - * > > - * 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. > > */ > > I think above makes sense, since I had to pick the most restrictive one > to satisfy both license option (GPL-2.0+ or GPL-2.0-only). I am not sure "had to pick the most restrictive one" is necessarily correct - the kernel could adopt that approach but I don't think there's any reason why you can't have multiple SPDX-License-Identifier: lines in a single source file, and it is also syntactically valid to use SPDX-License-Identifier: GPL-2.0-only AND GPL-2.0-or-later Richard
