linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH RFC] SUNRPC: Add SPDX IDs to some net/sunrpc/auth_gss/ files
@ 2019-01-17 22:02 Chuck Lever
  2019-01-18  7:29 ` Christoph Hellwig
  0 siblings, 1 reply; 4+ messages in thread
From: Chuck Lever @ 2019-01-17 22:02 UTC (permalink / raw)
  To: linux-nfs; +Cc: kstewart, simo

Files under net/sunrpc/auth_gss/ do not yet have SPDX ID tags.
This directory is somewhat complicated because most of these files
have license boilerplate that is not strictly GPL 2.0.

In this patch I add ID tags where there is an obvious match. The
less recognizable licenses are still under research.

For reference, SPDX IDs added in this patch correspond to the
following license text:

GPL-2.0         https://spdx.org/licenses/GPL-2.0.html
GPL-2.0+        https://spdx.org/licenses/GPL-2.0+.html
BSD-3-Clause    https://spdx.org/licenses/BSD-3-Clause.html

Cc: Simo Sorce <simo@redhat.com>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 net/sunrpc/auth_gss/auth_gss.c        |    1 +
 net/sunrpc/auth_gss/gss_krb5_mech.c   |    1 +
 net/sunrpc/auth_gss/gss_mech_switch.c |    1 +
 net/sunrpc/auth_gss/gss_rpc_upcall.c  |    1 +
 net/sunrpc/auth_gss/gss_rpc_upcall.h  |    1 +
 net/sunrpc/auth_gss/gss_rpc_xdr.c     |    1 +
 net/sunrpc/auth_gss/gss_rpc_xdr.h     |    1 +
 net/sunrpc/auth_gss/svcauth_gss.c     |    1 +
 8 files changed, 8 insertions(+)

diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index 3bf7cb0..0513891 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * linux/net/sunrpc/auth_gss/auth_gss.c
  *
diff --git a/net/sunrpc/auth_gss/gss_krb5_mech.c b/net/sunrpc/auth_gss/gss_krb5_mech.c
index be31a58..1286fe9 100644
--- a/net/sunrpc/auth_gss/gss_krb5_mech.c
+++ b/net/sunrpc/auth_gss/gss_krb5_mech.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  *  linux/net/sunrpc/gss_krb5_mech.c
  *
diff --git a/net/sunrpc/auth_gss/gss_mech_switch.c b/net/sunrpc/auth_gss/gss_mech_switch.c
index 379318d..cd32c12 100644
--- a/net/sunrpc/auth_gss/gss_mech_switch.c
+++ b/net/sunrpc/auth_gss/gss_mech_switch.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  *  linux/net/sunrpc/gss_mech_switch.c
  *
diff --git a/net/sunrpc/auth_gss/gss_rpc_upcall.c b/net/sunrpc/auth_gss/gss_rpc_upcall.c
index 73dcda0..21ff372 100644
--- a/net/sunrpc/auth_gss/gss_rpc_upcall.c
+++ b/net/sunrpc/auth_gss/gss_rpc_upcall.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  linux/net/sunrpc/gss_rpc_upcall.c
  *
diff --git a/net/sunrpc/auth_gss/gss_rpc_upcall.h b/net/sunrpc/auth_gss/gss_rpc_upcall.h
index 1e542ad..7adeeb9 100644
--- a/net/sunrpc/auth_gss/gss_rpc_upcall.h
+++ b/net/sunrpc/auth_gss/gss_rpc_upcall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  *  linux/net/sunrpc/gss_rpc_upcall.h
  *
diff --git a/net/sunrpc/auth_gss/gss_rpc_xdr.c b/net/sunrpc/auth_gss/gss_rpc_xdr.c
index 006062a..caf2428 100644
--- a/net/sunrpc/auth_gss/gss_rpc_xdr.c
+++ b/net/sunrpc/auth_gss/gss_rpc_xdr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * GSS Proxy upcall module
  *
diff --git a/net/sunrpc/auth_gss/gss_rpc_xdr.h b/net/sunrpc/auth_gss/gss_rpc_xdr.h
index 146c310..3877fa0 100644
--- a/net/sunrpc/auth_gss/gss_rpc_xdr.h
+++ b/net/sunrpc/auth_gss/gss_rpc_xdr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * GSS Proxy upcall module
  *
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index f1aabab..0c5d789 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Neil Brown <neilb@cse.unsw.edu.au>
  * J. Bruce Fields <bfields@umich.edu>


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH RFC] SUNRPC: Add SPDX IDs to some net/sunrpc/auth_gss/ files
  2019-01-17 22:02 [PATCH RFC] SUNRPC: Add SPDX IDs to some net/sunrpc/auth_gss/ files Chuck Lever
@ 2019-01-18  7:29 ` Christoph Hellwig
  2019-01-18 15:42   ` Chuck Lever
  0 siblings, 1 reply; 4+ messages in thread
From: Christoph Hellwig @ 2019-01-18  7:29 UTC (permalink / raw)
  To: Chuck Lever; +Cc: linux-nfs, kstewart, simo

The general idea is to replace the existing boilerplate with just the tag,
not add it on top.  Altough someone will have to conform how that works
with the BSD license.

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH RFC] SUNRPC: Add SPDX IDs to some net/sunrpc/auth_gss/ files
  2019-01-18  7:29 ` Christoph Hellwig
@ 2019-01-18 15:42   ` Chuck Lever
  2019-01-18 20:10     ` J. Bruce Fields
  0 siblings, 1 reply; 4+ messages in thread
From: Chuck Lever @ 2019-01-18 15:42 UTC (permalink / raw)
  To: Christoph Hellwig; +Cc: Linux NFS Mailing List, kstewart, simo



> On Jan 18, 2019, at 2:29 AM, Christoph Hellwig <hch@infradead.org> wrote:
> 
> The general idea is to replace the existing boilerplate with just the tag,
> not add it on top.  Altough someone will have to conform how that works
> with the BSD license.

The online SPDX license text matches the license text in these particular
files. Can I therefore assume I have permission to remove the boilerplate
in this patch?

--
Chuck Lever




^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH RFC] SUNRPC: Add SPDX IDs to some net/sunrpc/auth_gss/ files
  2019-01-18 15:42   ` Chuck Lever
@ 2019-01-18 20:10     ` J. Bruce Fields
  0 siblings, 0 replies; 4+ messages in thread
From: J. Bruce Fields @ 2019-01-18 20:10 UTC (permalink / raw)
  To: Chuck Lever; +Cc: Christoph Hellwig, Linux NFS Mailing List, kstewart, simo

On Fri, Jan 18, 2019 at 10:42:00AM -0500, Chuck Lever wrote:
> 
> 
> > On Jan 18, 2019, at 2:29 AM, Christoph Hellwig <hch@infradead.org> wrote:
> > 
> > The general idea is to replace the existing boilerplate with just the tag,
> > not add it on top.  Altough someone will have to conform how that works
> > with the BSD license.
> 
> The online SPDX license text matches the license text in these particular
> files. Can I therefore assume I have permission to remove the boilerplate
> in this patch?

I've got no special knowledge or insight, but: that sounds totally
reasonable to me.

--b.

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-01-18 20:10 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-17 22:02 [PATCH RFC] SUNRPC: Add SPDX IDs to some net/sunrpc/auth_gss/ files Chuck Lever
2019-01-18  7:29 ` Christoph Hellwig
2019-01-18 15:42   ` Chuck Lever
2019-01-18 20:10     ` J. Bruce Fields

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).