| Message ID | 20240214170949.793338-4-pvorel@suse.cz |
|---|---|
| State | Accepted |
| Headers | show |
| Series | License cleanup | expand |
On 14. 02. 24 18:09, Petr Vorel wrote: > Cc: Cyril Hrubis <chrubis@suse.cz> > Cc: Jan Kara <jack@suse.cz> > Cc: Amir Goldstein <amir73il@gmail.com> > Cc: Matthew Bobrowski <mbobrowski@mbobrowski.org> > Cc: Jan Stancek <jstancek@redhat.com> > Cc: Martin Doucha <mdoucha@suse.cz> > Cc: Richard Palethorpe <io@richiejp.com> > Signed-off-by: Petr Vorel <pvorel@suse.cz> > --- > Hi all, > > I'm sorry to steal your time with license cleanup. > > LTP started as GPL v2 only around 2001. Later new tests were changed to > GPL v2+. When we later started using SPDX, we use GPL-2.0 which actually > means GPL-2.0-only. Please if you agree with changing GPL-2.0-or-later > for tests you wrote ack this (or send a patch where you change it if you > prefer). If you don't agree or you don't reply your files will stay > GPL v2 only (just SPDX will be changed to GPL-2.0-only to be obvious.) > > Kind regards, > Petr > > Martin Doucha > testcases/kernel/syscalls/ptrace/ptrace08.c I would ack licence change for ptrace08 but it's based on a reproducer by Andrew Lutomirsky which is licensed under GPL-2.0: https://github.com/linux-test-project/ltp/issues/593 Therefore my ack is not sufficient.
On Wed, Feb 14, 2024 at 6:10 PM Petr Vorel <pvorel@suse.cz> wrote: > > Cc: Cyril Hrubis <chrubis@suse.cz> > Cc: Jan Kara <jack@suse.cz> > Cc: Amir Goldstein <amir73il@gmail.com> > Cc: Matthew Bobrowski <mbobrowski@mbobrowski.org> > Cc: Jan Stancek <jstancek@redhat.com> > Cc: Martin Doucha <mdoucha@suse.cz> > Cc: Richard Palethorpe <io@richiejp.com> > Signed-off-by: Petr Vorel <pvorel@suse.cz> > --- > Hi all, > > I'm sorry to steal your time with license cleanup. > > LTP started as GPL v2 only around 2001. Later new tests were changed to > GPL v2+. When we later started using SPDX, we use GPL-2.0 which actually > means GPL-2.0-only. Please if you agree with changing GPL-2.0-or-later > for tests you wrote ack this (or send a patch where you change it if you > prefer). If you don't agree or you don't reply your files will stay > GPL v2 only (just SPDX will be changed to GPL-2.0-only to be obvious.) > > Kind regards, > Petr > > Matthew Bobrowski > testcases/kernel/syscalls/fanotify/fanotify12.c > testcases/kernel/syscalls/fanotify/fanotify13.c > testcases/kernel/syscalls/fanotify/fanotify14.c > testcases/kernel/syscalls/fanotify/fanotify_child.c > > Amir Goldstein > testcases/kernel/syscalls/fanotify/fanotify06.c > testcases/kernel/syscalls/fanotify/fanotify10.c > testcases/kernel/syscalls/fanotify/fanotify23.c > testcases/kernel/syscalls/fcntl/fcntl38.c > testcases/kernel/syscalls/fcntl/fcntl39.c > testcases/kernel/syscalls/inotify/inotify10.c > > Jan Kara > testcases/kernel/syscalls/fanotify/fanotify01.c > testcases/kernel/syscalls/fanotify/fanotify02.c > testcases/kernel/syscalls/fanotify/fanotify03.c > testcases/kernel/syscalls/fanotify/fanotify04.c > testcases/kernel/syscalls/fanotify/fanotify05.c > testcases/kernel/syscalls/fanotify/fanotify06.c > testcases/kernel/syscalls/fanotify/fanotify10.c > > Richard Palethorpe > testcases/kernel/controllers/io/io_control01.c > testcases/kernel/syscalls/close_range/close_range01.c > testcases/kernel/syscalls/close_range/close_range02.c > > Martin Doucha > testcases/kernel/syscalls/ptrace/ptrace08.c > > Jan Stancek > testcases/kernel/syscalls/readahead/readahead01.c Acked-by: Jan Stancek <jstancek@redhat.com> > > Cyril Hrubis > lib/tst_fs_type.c > lib/tst_process_state.c > lib/tst_timer.c > include/tst_process_state.h (originally v2 only, but changed by me to v2+, can be kept?) > > lib/tst_fs_type.c | 2 +- > lib/tst_process_state.c | 2 +- > lib/tst_timer.c | 2 +- > testcases/kernel/controllers/io/io_control01.c | 2 +- > testcases/kernel/syscalls/close_range/close_range01.c | 2 +- > testcases/kernel/syscalls/close_range/close_range02.c | 2 +- > testcases/kernel/syscalls/fanotify/fanotify01.c | 2 +- > testcases/kernel/syscalls/fanotify/fanotify02.c | 2 +- > testcases/kernel/syscalls/fanotify/fanotify03.c | 2 +- > testcases/kernel/syscalls/fanotify/fanotify04.c | 2 +- > testcases/kernel/syscalls/fanotify/fanotify05.c | 2 +- > testcases/kernel/syscalls/fanotify/fanotify06.c | 2 +- > testcases/kernel/syscalls/fanotify/fanotify10.c | 2 +- > testcases/kernel/syscalls/fanotify/fanotify12.c | 2 +- > testcases/kernel/syscalls/fanotify/fanotify13.c | 2 +- > testcases/kernel/syscalls/fanotify/fanotify14.c | 2 +- > testcases/kernel/syscalls/fanotify/fanotify23.c | 2 +- > testcases/kernel/syscalls/fanotify/fanotify_child.c | 2 +- > testcases/kernel/syscalls/fcntl/fcntl38.c | 2 +- > testcases/kernel/syscalls/fcntl/fcntl39.c | 2 +- > testcases/kernel/syscalls/inotify/inotify10.c | 2 +- > testcases/kernel/syscalls/ptrace/ptrace08.c | 2 +- > testcases/kernel/syscalls/readahead/readahead01.c | 2 +- > 23 files changed, 23 insertions(+), 23 deletions(-) > > diff --git a/lib/tst_fs_type.c b/lib/tst_fs_type.c > index 7f0d61a8e..e9efb89dc 100644 > --- a/lib/tst_fs_type.c > +++ b/lib/tst_fs_type.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2005-2021 Linux Test Project > * > diff --git a/lib/tst_process_state.c b/lib/tst_process_state.c > index c15283c3d..033af2023 100644 > --- a/lib/tst_process_state.c > +++ b/lib/tst_process_state.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (C) 2012-2014 Cyril Hrubis chrubis@suse.cz > * Copyright (c) 2021 Xie Ziyao <xieziyao@huawei.com> > diff --git a/lib/tst_timer.c b/lib/tst_timer.c > index 62d8f9080..ecf165ca4 100644 > --- a/lib/tst_timer.c > +++ b/lib/tst_timer.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (C) 2015 Cyril Hrubis <chrubis@suse.cz> > */ > diff --git a/testcases/kernel/controllers/io/io_control01.c b/testcases/kernel/controllers/io/io_control01.c > index 691196886..47ae0f104 100644 > --- a/testcases/kernel/controllers/io/io_control01.c > +++ b/testcases/kernel/controllers/io/io_control01.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2022 SUSE LLC <rpalethorpe@suse.com> > */ > diff --git a/testcases/kernel/syscalls/close_range/close_range01.c b/testcases/kernel/syscalls/close_range/close_range01.c > index 072bbab66..c2a0c9619 100644 > --- a/testcases/kernel/syscalls/close_range/close_range01.c > +++ b/testcases/kernel/syscalls/close_range/close_range01.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Taken from the kernel self tests, which in turn were based on > * a Syzkaller reproducer. > diff --git a/testcases/kernel/syscalls/close_range/close_range02.c b/testcases/kernel/syscalls/close_range/close_range02.c > index 2aa6d2c9f..48d9a31df 100644 > --- a/testcases/kernel/syscalls/close_range/close_range02.c > +++ b/testcases/kernel/syscalls/close_range/close_range02.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2021 SUSE LLC > */ > diff --git a/testcases/kernel/syscalls/fanotify/fanotify01.c b/testcases/kernel/syscalls/fanotify/fanotify01.c > index 3cb485c2a..5d18fe851 100644 > --- a/testcases/kernel/syscalls/fanotify/fanotify01.c > +++ b/testcases/kernel/syscalls/fanotify/fanotify01.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2013 SUSE. All Rights Reserved. > * > diff --git a/testcases/kernel/syscalls/fanotify/fanotify02.c b/testcases/kernel/syscalls/fanotify/fanotify02.c > index 3321e5526..19854064a 100644 > --- a/testcases/kernel/syscalls/fanotify/fanotify02.c > +++ b/testcases/kernel/syscalls/fanotify/fanotify02.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2013 SUSE. All Rights Reserved. > * > diff --git a/testcases/kernel/syscalls/fanotify/fanotify03.c b/testcases/kernel/syscalls/fanotify/fanotify03.c > index 028da742c..3ed78e5fa 100644 > --- a/testcases/kernel/syscalls/fanotify/fanotify03.c > +++ b/testcases/kernel/syscalls/fanotify/fanotify03.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2013 SUSE. All Rights Reserved. > * > diff --git a/testcases/kernel/syscalls/fanotify/fanotify04.c b/testcases/kernel/syscalls/fanotify/fanotify04.c > index 8541a7b96..378bc57c0 100644 > --- a/testcases/kernel/syscalls/fanotify/fanotify04.c > +++ b/testcases/kernel/syscalls/fanotify/fanotify04.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2013 SUSE. All Rights Reserved. > * > diff --git a/testcases/kernel/syscalls/fanotify/fanotify05.c b/testcases/kernel/syscalls/fanotify/fanotify05.c > index 04670cb1c..12c240881 100644 > --- a/testcases/kernel/syscalls/fanotify/fanotify05.c > +++ b/testcases/kernel/syscalls/fanotify/fanotify05.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2014 SUSE Linux. All Rights Reserved. > * > diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c > index 618c85a43..8779e34d9 100644 > --- a/testcases/kernel/syscalls/fanotify/fanotify06.c > +++ b/testcases/kernel/syscalls/fanotify/fanotify06.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2014 SUSE. All Rights Reserved. > * > diff --git a/testcases/kernel/syscalls/fanotify/fanotify10.c b/testcases/kernel/syscalls/fanotify/fanotify10.c > index 6c89ca1d0..c6d8ec922 100644 > --- a/testcases/kernel/syscalls/fanotify/fanotify10.c > +++ b/testcases/kernel/syscalls/fanotify/fanotify10.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2014 SUSE. All Rights Reserved. > * Copyright (c) 2018 CTERA Networks. All Rights Reserved. > diff --git a/testcases/kernel/syscalls/fanotify/fanotify12.c b/testcases/kernel/syscalls/fanotify/fanotify12.c > index 42ba08800..60ba27e16 100644 > --- a/testcases/kernel/syscalls/fanotify/fanotify12.c > +++ b/testcases/kernel/syscalls/fanotify/fanotify12.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2018 Matthew Bobrowski. All Rights Reserved. > * > diff --git a/testcases/kernel/syscalls/fanotify/fanotify13.c b/testcases/kernel/syscalls/fanotify/fanotify13.c > index 6086a81fc..5cd857707 100644 > --- a/testcases/kernel/syscalls/fanotify/fanotify13.c > +++ b/testcases/kernel/syscalls/fanotify/fanotify13.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2018 Matthew Bobrowski. All Rights Reserved. > * > diff --git a/testcases/kernel/syscalls/fanotify/fanotify14.c b/testcases/kernel/syscalls/fanotify/fanotify14.c > index 0b0da89ca..d02d81495 100644 > --- a/testcases/kernel/syscalls/fanotify/fanotify14.c > +++ b/testcases/kernel/syscalls/fanotify/fanotify14.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2018 Matthew Bobrowski. All Rights Reserved. > * Copyright (c) Linux Test Project, 2020-2022 > diff --git a/testcases/kernel/syscalls/fanotify/fanotify23.c b/testcases/kernel/syscalls/fanotify/fanotify23.c > index 5a03503e9..35a613fea 100644 > --- a/testcases/kernel/syscalls/fanotify/fanotify23.c > +++ b/testcases/kernel/syscalls/fanotify/fanotify23.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2022 CTERA Networks. All Rights Reserved. > * > diff --git a/testcases/kernel/syscalls/fanotify/fanotify_child.c b/testcases/kernel/syscalls/fanotify/fanotify_child.c > index 2e4e189cb..73f634514 100644 > --- a/testcases/kernel/syscalls/fanotify/fanotify_child.c > +++ b/testcases/kernel/syscalls/fanotify/fanotify_child.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2018 Matthew Bobrowski. All Rights Reserved. > * > diff --git a/testcases/kernel/syscalls/fcntl/fcntl38.c b/testcases/kernel/syscalls/fcntl/fcntl38.c > index 2f1b0229e..d867bf876 100644 > --- a/testcases/kernel/syscalls/fcntl/fcntl38.c > +++ b/testcases/kernel/syscalls/fcntl/fcntl38.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2020 CTERA Networks. All Rights Reserved. > * > diff --git a/testcases/kernel/syscalls/fcntl/fcntl39.c b/testcases/kernel/syscalls/fcntl/fcntl39.c > index 973b6a652..30aada2aa 100644 > --- a/testcases/kernel/syscalls/fcntl/fcntl39.c > +++ b/testcases/kernel/syscalls/fcntl/fcntl39.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2021 CTERA Networks. All Rights Reserved. > * > diff --git a/testcases/kernel/syscalls/inotify/inotify10.c b/testcases/kernel/syscalls/inotify/inotify10.c > index ed91b920f..6a9a0a436 100644 > --- a/testcases/kernel/syscalls/inotify/inotify10.c > +++ b/testcases/kernel/syscalls/inotify/inotify10.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2020 CTERA Networks. All Rights Reserved. > * > diff --git a/testcases/kernel/syscalls/ptrace/ptrace08.c b/testcases/kernel/syscalls/ptrace/ptrace08.c > index d17d6b411..9e64edc48 100644 > --- a/testcases/kernel/syscalls/ptrace/ptrace08.c > +++ b/testcases/kernel/syscalls/ptrace/ptrace08.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2018 Andrew Lutomirski > * Copyright (C) 2020 SUSE LLC <mdoucha@suse.cz> > diff --git a/testcases/kernel/syscalls/readahead/readahead01.c b/testcases/kernel/syscalls/readahead/readahead01.c > index a1f313605..0f610daf8 100644 > --- a/testcases/kernel/syscalls/readahead/readahead01.c > +++ b/testcases/kernel/syscalls/readahead/readahead01.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (C) 2012 Linux Test Project, Inc. > * Copyright (C) 2023-2024 Cyril Hrubis <chrubis@suse.cz> > -- > 2.43.0 >
> On 14. 02. 24 18:09, Petr Vorel wrote: > > Cc: Cyril Hrubis <chrubis@suse.cz> > > Cc: Jan Kara <jack@suse.cz> > > Cc: Amir Goldstein <amir73il@gmail.com> > > Cc: Matthew Bobrowski <mbobrowski@mbobrowski.org> > > Cc: Jan Stancek <jstancek@redhat.com> > > Cc: Martin Doucha <mdoucha@suse.cz> > > Cc: Richard Palethorpe <io@richiejp.com> > > Signed-off-by: Petr Vorel <pvorel@suse.cz> > > --- > > Hi all, > > I'm sorry to steal your time with license cleanup. > > LTP started as GPL v2 only around 2001. Later new tests were changed to > > GPL v2+. When we later started using SPDX, we use GPL-2.0 which actually > > means GPL-2.0-only. Please if you agree with changing GPL-2.0-or-later > > for tests you wrote ack this (or send a patch where you change it if you > > prefer). If you don't agree or you don't reply your files will stay > > GPL v2 only (just SPDX will be changed to GPL-2.0-only to be obvious.) > > Kind regards, > > Petr > > Martin Doucha > > testcases/kernel/syscalls/ptrace/ptrace08.c > I would ack licence change for ptrace08 but it's based on a reproducer by > Andrew Lutomirsky which is licensed under GPL-2.0: > https://github.com/linux-test-project/ltp/issues/593 > Therefore my ack is not sufficient. Very good catch, thank you. This one will stay GPL-2.0-only. Kind regards, Petr
Hi!
Acked-by: Cyril Hrubis <chrubis@suse.cz>
On Wed 14-02-24 18:09:49, Petr Vorel wrote: > Cc: Cyril Hrubis <chrubis@suse.cz> > Cc: Jan Kara <jack@suse.cz> > Cc: Amir Goldstein <amir73il@gmail.com> > Cc: Matthew Bobrowski <mbobrowski@mbobrowski.org> > Cc: Jan Stancek <jstancek@redhat.com> > Cc: Martin Doucha <mdoucha@suse.cz> > Cc: Richard Palethorpe <io@richiejp.com> > Signed-off-by: Petr Vorel <pvorel@suse.cz> > --- > Hi all, > > I'm sorry to steal your time with license cleanup. > > LTP started as GPL v2 only around 2001. Later new tests were changed to > GPL v2+. When we later started using SPDX, we use GPL-2.0 which actually > means GPL-2.0-only. Please if you agree with changing GPL-2.0-or-later > for tests you wrote ack this (or send a patch where you change it if you > prefer). If you don't agree or you don't reply your files will stay > GPL v2 only (just SPDX will be changed to GPL-2.0-only to be obvious.) ... > Jan Kara > testcases/kernel/syscalls/fanotify/fanotify01.c > testcases/kernel/syscalls/fanotify/fanotify02.c > testcases/kernel/syscalls/fanotify/fanotify03.c > testcases/kernel/syscalls/fanotify/fanotify04.c > testcases/kernel/syscalls/fanotify/fanotify05.c > testcases/kernel/syscalls/fanotify/fanotify06.c > testcases/kernel/syscalls/fanotify/fanotify10.c Acked-by: Jan Kara <jack@suse.cz> Honza
On Thu, Feb 15, 2024 at 10:23 AM Jan Kara <jack@suse.cz> wrote: > > On Wed 14-02-24 18:09:49, Petr Vorel wrote: > > Cc: Cyril Hrubis <chrubis@suse.cz> > > Cc: Jan Kara <jack@suse.cz> > > Cc: Amir Goldstein <amir73il@gmail.com> > > Cc: Matthew Bobrowski <mbobrowski@mbobrowski.org> > > Cc: Jan Stancek <jstancek@redhat.com> > > Cc: Martin Doucha <mdoucha@suse.cz> > > Cc: Richard Palethorpe <io@richiejp.com> > > Signed-off-by: Petr Vorel <pvorel@suse.cz> > > --- > > Hi all, > > > > I'm sorry to steal your time with license cleanup. > > > > LTP started as GPL v2 only around 2001. Later new tests were changed to > > GPL v2+. When we later started using SPDX, we use GPL-2.0 which actually > > means GPL-2.0-only. Please if you agree with changing GPL-2.0-or-later > > for tests you wrote ack this (or send a patch where you change it if you > > prefer). If you don't agree or you don't reply your files will stay > > GPL v2 only (just SPDX will be changed to GPL-2.0-only to be obvious.) > ... > > Jan Kara > > testcases/kernel/syscalls/fanotify/fanotify01.c > > testcases/kernel/syscalls/fanotify/fanotify02.c > > testcases/kernel/syscalls/fanotify/fanotify03.c > > testcases/kernel/syscalls/fanotify/fanotify04.c > > testcases/kernel/syscalls/fanotify/fanotify05.c > > testcases/kernel/syscalls/fanotify/fanotify06.c > > testcases/kernel/syscalls/fanotify/fanotify10.c Acked-by: Matt Bobrowski <mattbobrowski@google.com>
Hi Petr,
All looks good to me. Feel free to merge this patchset.
Reviewed-by: Li Wang <liwang@redhat.com>
--
Regards,
Li Wang
Hi Li, > Hi Petr, > All looks good to me. Feel free to merge this patchset. Thank you! FYI I'm still waiting for Amir's ack. I guess we could relicense Richie's work without his ack (SUSE work actually), but at least testcases/kernel/syscalls/close_range/close_range01.c is from kselftest (tools/testing/selftests/core/close_range_test.c), which is GPL v2 only, I suppose I should use GPL-2.0-only for this one. I haven't found a record that other two from Richie would be from kselftest, thus I'll use GPL-2.0-or-later for them. Kind regards, Petr
On Fri, Mar 1, 2024 at 10:59 AM Petr Vorel <pvorel@suse.cz> wrote: > > Hi Li, > > > Hi Petr, > > > All looks good to me. Feel free to merge this patchset. > > Thank you! FYI I'm still waiting for Amir's ack. > Acked-by: Amir Goldstein <amir73il@gmail.com> Thanks, Amir. > I guess we could relicense Richie's work without his ack (SUSE work actually), > but at least testcases/kernel/syscalls/close_range/close_range01.c is from > kselftest (tools/testing/selftests/core/close_range_test.c), which is GPL v2 > only, I suppose I should use GPL-2.0-only for this one. > I haven't found a record that other two from Richie would be from kselftest, > thus I'll use GPL-2.0-or-later for them. > > Kind regards, > Petr
Hi all, > On Fri, Mar 1, 2024 at 10:59 AM Petr Vorel <pvorel@suse.cz> wrote: > > Hi Li, > > > Hi Petr, > > > All looks good to me. Feel free to merge this patchset. > > Thank you! FYI I'm still waiting for Amir's ack. > Acked-by: Amir Goldstein <amir73il@gmail.com> Thanks a lot, Amir! > Thanks, > Amir. > > I guess we could relicense Richie's work without his ack (SUSE work actually), > > but at least testcases/kernel/syscalls/close_range/close_range01.c is from > > kselftest (tools/testing/selftests/core/close_range_test.c), which is GPL v2 > > only, I suppose I should use GPL-2.0-only for this one. > > I haven't found a record that other two from Richie would be from kselftest, > > thus I'll use GPL-2.0-or-later for them. Patchset merged with these changes in the second commit. Thanks to you all. Kind regards, Petr > > Kind regards, > > Petr
diff --git a/lib/tst_fs_type.c b/lib/tst_fs_type.c index 7f0d61a8e..e9efb89dc 100644 --- a/lib/tst_fs_type.c +++ b/lib/tst_fs_type.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2005-2021 Linux Test Project * diff --git a/lib/tst_process_state.c b/lib/tst_process_state.c index c15283c3d..033af2023 100644 --- a/lib/tst_process_state.c +++ b/lib/tst_process_state.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012-2014 Cyril Hrubis chrubis@suse.cz * Copyright (c) 2021 Xie Ziyao <xieziyao@huawei.com> diff --git a/lib/tst_timer.c b/lib/tst_timer.c index 62d8f9080..ecf165ca4 100644 --- a/lib/tst_timer.c +++ b/lib/tst_timer.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2015 Cyril Hrubis <chrubis@suse.cz> */ diff --git a/testcases/kernel/controllers/io/io_control01.c b/testcases/kernel/controllers/io/io_control01.c index 691196886..47ae0f104 100644 --- a/testcases/kernel/controllers/io/io_control01.c +++ b/testcases/kernel/controllers/io/io_control01.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 SUSE LLC <rpalethorpe@suse.com> */ diff --git a/testcases/kernel/syscalls/close_range/close_range01.c b/testcases/kernel/syscalls/close_range/close_range01.c index 072bbab66..c2a0c9619 100644 --- a/testcases/kernel/syscalls/close_range/close_range01.c +++ b/testcases/kernel/syscalls/close_range/close_range01.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Taken from the kernel self tests, which in turn were based on * a Syzkaller reproducer. diff --git a/testcases/kernel/syscalls/close_range/close_range02.c b/testcases/kernel/syscalls/close_range/close_range02.c index 2aa6d2c9f..48d9a31df 100644 --- a/testcases/kernel/syscalls/close_range/close_range02.c +++ b/testcases/kernel/syscalls/close_range/close_range02.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 SUSE LLC */ diff --git a/testcases/kernel/syscalls/fanotify/fanotify01.c b/testcases/kernel/syscalls/fanotify/fanotify01.c index 3cb485c2a..5d18fe851 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify01.c +++ b/testcases/kernel/syscalls/fanotify/fanotify01.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 SUSE. All Rights Reserved. * diff --git a/testcases/kernel/syscalls/fanotify/fanotify02.c b/testcases/kernel/syscalls/fanotify/fanotify02.c index 3321e5526..19854064a 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify02.c +++ b/testcases/kernel/syscalls/fanotify/fanotify02.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 SUSE. All Rights Reserved. * diff --git a/testcases/kernel/syscalls/fanotify/fanotify03.c b/testcases/kernel/syscalls/fanotify/fanotify03.c index 028da742c..3ed78e5fa 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify03.c +++ b/testcases/kernel/syscalls/fanotify/fanotify03.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 SUSE. All Rights Reserved. * diff --git a/testcases/kernel/syscalls/fanotify/fanotify04.c b/testcases/kernel/syscalls/fanotify/fanotify04.c index 8541a7b96..378bc57c0 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify04.c +++ b/testcases/kernel/syscalls/fanotify/fanotify04.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2013 SUSE. All Rights Reserved. * diff --git a/testcases/kernel/syscalls/fanotify/fanotify05.c b/testcases/kernel/syscalls/fanotify/fanotify05.c index 04670cb1c..12c240881 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify05.c +++ b/testcases/kernel/syscalls/fanotify/fanotify05.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 SUSE Linux. All Rights Reserved. * diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c index 618c85a43..8779e34d9 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify06.c +++ b/testcases/kernel/syscalls/fanotify/fanotify06.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 SUSE. All Rights Reserved. * diff --git a/testcases/kernel/syscalls/fanotify/fanotify10.c b/testcases/kernel/syscalls/fanotify/fanotify10.c index 6c89ca1d0..c6d8ec922 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify10.c +++ b/testcases/kernel/syscalls/fanotify/fanotify10.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2014 SUSE. All Rights Reserved. * Copyright (c) 2018 CTERA Networks. All Rights Reserved. diff --git a/testcases/kernel/syscalls/fanotify/fanotify12.c b/testcases/kernel/syscalls/fanotify/fanotify12.c index 42ba08800..60ba27e16 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify12.c +++ b/testcases/kernel/syscalls/fanotify/fanotify12.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 Matthew Bobrowski. All Rights Reserved. * diff --git a/testcases/kernel/syscalls/fanotify/fanotify13.c b/testcases/kernel/syscalls/fanotify/fanotify13.c index 6086a81fc..5cd857707 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify13.c +++ b/testcases/kernel/syscalls/fanotify/fanotify13.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 Matthew Bobrowski. All Rights Reserved. * diff --git a/testcases/kernel/syscalls/fanotify/fanotify14.c b/testcases/kernel/syscalls/fanotify/fanotify14.c index 0b0da89ca..d02d81495 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify14.c +++ b/testcases/kernel/syscalls/fanotify/fanotify14.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 Matthew Bobrowski. All Rights Reserved. * Copyright (c) Linux Test Project, 2020-2022 diff --git a/testcases/kernel/syscalls/fanotify/fanotify23.c b/testcases/kernel/syscalls/fanotify/fanotify23.c index 5a03503e9..35a613fea 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify23.c +++ b/testcases/kernel/syscalls/fanotify/fanotify23.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2022 CTERA Networks. All Rights Reserved. * diff --git a/testcases/kernel/syscalls/fanotify/fanotify_child.c b/testcases/kernel/syscalls/fanotify/fanotify_child.c index 2e4e189cb..73f634514 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify_child.c +++ b/testcases/kernel/syscalls/fanotify/fanotify_child.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 Matthew Bobrowski. All Rights Reserved. * diff --git a/testcases/kernel/syscalls/fcntl/fcntl38.c b/testcases/kernel/syscalls/fcntl/fcntl38.c index 2f1b0229e..d867bf876 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl38.c +++ b/testcases/kernel/syscalls/fcntl/fcntl38.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020 CTERA Networks. All Rights Reserved. * diff --git a/testcases/kernel/syscalls/fcntl/fcntl39.c b/testcases/kernel/syscalls/fcntl/fcntl39.c index 973b6a652..30aada2aa 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl39.c +++ b/testcases/kernel/syscalls/fcntl/fcntl39.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2021 CTERA Networks. All Rights Reserved. * diff --git a/testcases/kernel/syscalls/inotify/inotify10.c b/testcases/kernel/syscalls/inotify/inotify10.c index ed91b920f..6a9a0a436 100644 --- a/testcases/kernel/syscalls/inotify/inotify10.c +++ b/testcases/kernel/syscalls/inotify/inotify10.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2020 CTERA Networks. All Rights Reserved. * diff --git a/testcases/kernel/syscalls/ptrace/ptrace08.c b/testcases/kernel/syscalls/ptrace/ptrace08.c index d17d6b411..9e64edc48 100644 --- a/testcases/kernel/syscalls/ptrace/ptrace08.c +++ b/testcases/kernel/syscalls/ptrace/ptrace08.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2018 Andrew Lutomirski * Copyright (C) 2020 SUSE LLC <mdoucha@suse.cz> diff --git a/testcases/kernel/syscalls/readahead/readahead01.c b/testcases/kernel/syscalls/readahead/readahead01.c index a1f313605..0f610daf8 100644 --- a/testcases/kernel/syscalls/readahead/readahead01.c +++ b/testcases/kernel/syscalls/readahead/readahead01.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2012 Linux Test Project, Inc. * Copyright (C) 2023-2024 Cyril Hrubis <chrubis@suse.cz>
Cc: Cyril Hrubis <chrubis@suse.cz> Cc: Jan Kara <jack@suse.cz> Cc: Amir Goldstein <amir73il@gmail.com> Cc: Matthew Bobrowski <mbobrowski@mbobrowski.org> Cc: Jan Stancek <jstancek@redhat.com> Cc: Martin Doucha <mdoucha@suse.cz> Cc: Richard Palethorpe <io@richiejp.com> Signed-off-by: Petr Vorel <pvorel@suse.cz> --- Hi all, I'm sorry to steal your time with license cleanup. LTP started as GPL v2 only around 2001. Later new tests were changed to GPL v2+. When we later started using SPDX, we use GPL-2.0 which actually means GPL-2.0-only. Please if you agree with changing GPL-2.0-or-later for tests you wrote ack this (or send a patch where you change it if you prefer). If you don't agree or you don't reply your files will stay GPL v2 only (just SPDX will be changed to GPL-2.0-only to be obvious.) Kind regards, Petr Matthew Bobrowski testcases/kernel/syscalls/fanotify/fanotify12.c testcases/kernel/syscalls/fanotify/fanotify13.c testcases/kernel/syscalls/fanotify/fanotify14.c testcases/kernel/syscalls/fanotify/fanotify_child.c Amir Goldstein testcases/kernel/syscalls/fanotify/fanotify06.c testcases/kernel/syscalls/fanotify/fanotify10.c testcases/kernel/syscalls/fanotify/fanotify23.c testcases/kernel/syscalls/fcntl/fcntl38.c testcases/kernel/syscalls/fcntl/fcntl39.c testcases/kernel/syscalls/inotify/inotify10.c Jan Kara testcases/kernel/syscalls/fanotify/fanotify01.c testcases/kernel/syscalls/fanotify/fanotify02.c testcases/kernel/syscalls/fanotify/fanotify03.c testcases/kernel/syscalls/fanotify/fanotify04.c testcases/kernel/syscalls/fanotify/fanotify05.c testcases/kernel/syscalls/fanotify/fanotify06.c testcases/kernel/syscalls/fanotify/fanotify10.c Richard Palethorpe testcases/kernel/controllers/io/io_control01.c testcases/kernel/syscalls/close_range/close_range01.c testcases/kernel/syscalls/close_range/close_range02.c Martin Doucha testcases/kernel/syscalls/ptrace/ptrace08.c Jan Stancek testcases/kernel/syscalls/readahead/readahead01.c Cyril Hrubis lib/tst_fs_type.c lib/tst_process_state.c lib/tst_timer.c include/tst_process_state.h (originally v2 only, but changed by me to v2+, can be kept?) lib/tst_fs_type.c | 2 +- lib/tst_process_state.c | 2 +- lib/tst_timer.c | 2 +- testcases/kernel/controllers/io/io_control01.c | 2 +- testcases/kernel/syscalls/close_range/close_range01.c | 2 +- testcases/kernel/syscalls/close_range/close_range02.c | 2 +- testcases/kernel/syscalls/fanotify/fanotify01.c | 2 +- testcases/kernel/syscalls/fanotify/fanotify02.c | 2 +- testcases/kernel/syscalls/fanotify/fanotify03.c | 2 +- testcases/kernel/syscalls/fanotify/fanotify04.c | 2 +- testcases/kernel/syscalls/fanotify/fanotify05.c | 2 +- testcases/kernel/syscalls/fanotify/fanotify06.c | 2 +- testcases/kernel/syscalls/fanotify/fanotify10.c | 2 +- testcases/kernel/syscalls/fanotify/fanotify12.c | 2 +- testcases/kernel/syscalls/fanotify/fanotify13.c | 2 +- testcases/kernel/syscalls/fanotify/fanotify14.c | 2 +- testcases/kernel/syscalls/fanotify/fanotify23.c | 2 +- testcases/kernel/syscalls/fanotify/fanotify_child.c | 2 +- testcases/kernel/syscalls/fcntl/fcntl38.c | 2 +- testcases/kernel/syscalls/fcntl/fcntl39.c | 2 +- testcases/kernel/syscalls/inotify/inotify10.c | 2 +- testcases/kernel/syscalls/ptrace/ptrace08.c | 2 +- testcases/kernel/syscalls/readahead/readahead01.c | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-)