netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org
Subject: [PATCH 06/19] batman-adv: Change batman_adv.h license to MIT
Date: Wed, 20 Dec 2017 12:01:11 +0100	[thread overview]
Message-ID: <20171220110124.13117-7-sw@simonwunderlich.de> (raw)
In-Reply-To: <20171220110124.13117-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>

From: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org>

The ISC license is considered as not recommended in "Linux kernel licensing
rules". It should only be used for existing code or for importing code from
a different project with that license.

But the kernel still has the similar sounding MIT/Expat license under the
preferred licenses. Switching to this license for this relatively new file
should therefore allow batman-adv to better follow the new licensing rules.

Signed-off-by: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org>
Acked-by: Antonio Quartulli <a@unstable.cc>
Acked-by: Matthias Schiffer <mschiffer-Nyw9WiXk/RKXhJHkyCwd5uTW4wlIGRCZ@public.gmane.org>
Acked-by: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
Signed-off-by: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>
---
 include/uapi/linux/batman_adv.h | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h
index fb4533826163..ae00c99cbed0 100644
--- a/include/uapi/linux/batman_adv.h
+++ b/include/uapi/linux/batman_adv.h
@@ -1,19 +1,25 @@
-/* SPDX-License-Identifier: ISC */
+/* SPDX-License-Identifier: MIT */
 /* Copyright (C) 2016-2017  B.A.T.M.A.N. contributors:
  *
  * Matthias Schiffer
  *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  */
 
 #ifndef _UAPI_LINUX_BATMAN_ADV_H_
-- 
2.11.0

  parent reply	other threads:[~2017-12-20 11:01 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-20 11:01 [PATCH 00/19] pull request for net-next: batman-adv 2017-12-20 Simon Wunderlich
2017-12-20 11:01 ` [PATCH 01/19] batman-adv: Start new development cycle Simon Wunderlich
2017-12-20 11:01 ` [PATCH 02/19] batman-adv: Deinline batadv_orig_hash_find, save 7339 bytes Simon Wunderlich
2017-12-20 11:01 ` [PATCH 03/19] batman-adv: Add SPDX license identifier above copyright header Simon Wunderlich
2017-12-20 11:01 ` [PATCH 04/19] batman-adv: Add SPDX license identifier to batman-adv.rst Simon Wunderlich
     [not found] ` <20171220110124.13117-1-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>
2017-12-20 11:01   ` [PATCH 05/19] batman-adv: Add license header to Kconfig Simon Wunderlich
2017-12-20 11:01   ` Simon Wunderlich [this message]
2017-12-20 11:01   ` [PATCH 07/19] batman-adv: include gfp.h for GFP_* defines Simon Wunderlich
2017-12-20 11:01   ` [PATCH 08/19] batman-adv: include build_bug.h for BUILD_BUG_ON define Simon Wunderlich
2017-12-20 11:01   ` [PATCH 10/19] batman-adv: include kobject.h for kobject_* functions Simon Wunderlich
2017-12-20 11:01 ` [PATCH 09/19] batman-adv: Include net.h for net_ratelimited_function Simon Wunderlich
2017-12-20 11:01 ` [PATCH 11/19] batman-adv: Remove unused sched.h include Simon Wunderlich
2017-12-20 11:01 ` [PATCH 12/19] batman-adv: Add missing kernel-doc to packet.h Simon Wunderlich
2017-12-20 11:01 ` [PATCH 13/19] batman-adv: Use parentheses in function kernel-doc Simon Wunderlich
2017-12-20 11:01 ` [PATCH 14/19] batman-adv: Use inline kernel-doc for enum/struct Simon Wunderlich
2017-12-20 11:01 ` [PATCH 15/19] batman-adv: Fix kernel-doc references to struct members Simon Wunderlich
2017-12-20 11:01 ` [PATCH 16/19] batman-adv: Add kernel-doc to structs in headers Simon Wunderlich
2017-12-20 11:01 ` [PATCH 17/19] batman-adv: Add kernel-doc to enums " Simon Wunderlich
2017-12-20 11:01 ` [PATCH 18/19] batman-adv: Add kernel-doc to functions " Simon Wunderlich
2017-12-20 11:01 ` [PATCH 19/19] batman-adv: Add kernel-doc to externally visible functions Simon Wunderlich
2017-12-20 19:39 ` [PATCH 00/19] pull request for net-next: batman-adv 2017-12-20 David Miller
2017-12-21  5:58   ` [B.A.T.M.A.N.] " Sven Eckelmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171220110124.13117-7-sw@simonwunderlich.de \
    --to=sw-2yrnx6ruihyiy0qsoawiaoquadtiucjx@public.gmane.org \
    --cc=b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org \
    --cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
    --cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).