* [B.A.T.M.A.N.] [PATCH 1/9] batman-adv: Add GPL-2.0 as Linux's LICENSES/preferred/GPL-2.0
2017-11-19 14:05 [B.A.T.M.A.N.] [PATCH 0/9] batman-adv: License cleanup Sven Eckelmann
@ 2017-11-19 14:05 ` Sven Eckelmann
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 2/9] batman-adv: Add License-Filename to GPL-2.0 files Sven Eckelmann
` (8 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Sven Eckelmann @ 2017-11-19 14:05 UTC (permalink / raw)
To: b.a.t.m.a.n
The batman-adv project shares files with other projects hosted on
kernel.org. These other projects use the filename
LICENSES/preferred/GPL-2.0 for the GPL-2.0 license. It is therefore
required to also use the same name for the license file when these files
reference this in their license header.
The SPDX header was imported from Linux but the actual GPL-2.0 text was
downloaded from https://www.gnu.org/licenses/gpl-2.0.txt
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
LICENSES/preferred/GPL-2.0 | 352 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 352 insertions(+)
create mode 100644 LICENSES/preferred/GPL-2.0
diff --git a/LICENSES/preferred/GPL-2.0 b/LICENSES/preferred/GPL-2.0
new file mode 100644
index 00000000..3bb0d185
--- /dev/null
+++ b/LICENSES/preferred/GPL-2.0
@@ -0,0 +1,352 @@
+Valid-License-Identifier: GPL-2.0
+Valid-License-Identifier: GPL-2.0+
+SPDX-URL: https://spdx.org/licenses/GPL-2.0.html
+Usage-Guide:
+ To use this license in source code, put one of the following SPDX
+ tag/value pairs into a comment according to the placement
+ guidelines in the licensing rules documentation.
+ For 'GNU General Public License (GPL) version 2 only' use:
+ SPDX-License-Identifier: GPL-2.0
+ For 'GNU General Public License (GPL) version 2 or any later version' use:
+ SPDX-License-Identifier: GPL-2.0+
+License-Text:
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [B.A.T.M.A.N.] [PATCH 2/9] batman-adv: Add License-Filename to GPL-2.0 files
2017-11-19 14:05 [B.A.T.M.A.N.] [PATCH 0/9] batman-adv: License cleanup Sven Eckelmann
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 1/9] batman-adv: Add GPL-2.0 as Linux's LICENSES/preferred/GPL-2.0 Sven Eckelmann
@ 2017-11-19 14:05 ` Sven Eckelmann
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 3/9] batman-adv: Add SPDX license identifier above copyright header Sven Eckelmann
` (7 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Sven Eckelmann @ 2017-11-19 14:05 UTC (permalink / raw)
To: b.a.t.m.a.n
The FSFE REUSE practices [1] recommend to add a "License-Filename" tag to
files which don't contain the complete license text. The GPL-2.0 files
usually only have a small notice at the beginning of the file. The longer
license is usually stored in a separate file and therefore should be
referenced accordingly.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Makefile | 1 +
compat-include/linux/average.h | 2 ++
compat-include/linux/cache.h | 2 ++
compat-include/linux/etherdevice.h | 2 ++
compat-include/linux/ethtool.h | 2 ++
compat-include/linux/export.h | 2 ++
compat-include/linux/genetlink.h | 2 ++
compat-include/linux/if_ether.h | 2 ++
compat-include/linux/if_vlan.h | 2 ++
compat-include/linux/kernel.h | 2 ++
compat-include/linux/kref.h | 2 ++
compat-include/linux/list.h | 2 ++
compat-include/linux/net.h | 2 ++
compat-include/linux/netdev_features.h | 2 ++
compat-include/linux/netdevice.h | 2 ++
compat-include/linux/netlink.h | 2 ++
compat-include/linux/random.h | 2 ++
compat-include/linux/rculist.h | 2 ++
compat-include/linux/seq_file.h | 2 ++
compat-include/linux/skbuff.h | 2 ++
compat-include/linux/slab.h | 2 ++
compat-include/net/genetlink.h | 2 ++
compat-sources/net/core/skbuff.c | 2 ++
compat-sources/net/ipv4/igmp.c | 2 ++
compat-sources/net/ipv6/mcast_snoop.c | 2 ++
compat.h | 2 ++
net/batman-adv/Makefile | 1 +
net/batman-adv/bat_algo.c | 2 ++
net/batman-adv/bat_algo.h | 2 ++
net/batman-adv/bat_iv_ogm.c | 2 ++
net/batman-adv/bat_iv_ogm.h | 2 ++
net/batman-adv/bat_v.c | 2 ++
net/batman-adv/bat_v.h | 2 ++
net/batman-adv/bat_v_elp.c | 2 ++
net/batman-adv/bat_v_elp.h | 2 ++
net/batman-adv/bat_v_ogm.c | 2 ++
net/batman-adv/bat_v_ogm.h | 2 ++
net/batman-adv/bitarray.c | 2 ++
net/batman-adv/bitarray.h | 2 ++
net/batman-adv/bridge_loop_avoidance.c | 2 ++
net/batman-adv/bridge_loop_avoidance.h | 2 ++
net/batman-adv/debugfs.c | 2 ++
net/batman-adv/debugfs.h | 2 ++
net/batman-adv/distributed-arp-table.c | 2 ++
net/batman-adv/distributed-arp-table.h | 2 ++
net/batman-adv/fragmentation.c | 2 ++
net/batman-adv/fragmentation.h | 2 ++
net/batman-adv/gateway_client.c | 2 ++
net/batman-adv/gateway_client.h | 2 ++
net/batman-adv/gateway_common.c | 2 ++
net/batman-adv/gateway_common.h | 2 ++
net/batman-adv/hard-interface.c | 2 ++
net/batman-adv/hard-interface.h | 2 ++
net/batman-adv/hash.c | 2 ++
net/batman-adv/hash.h | 2 ++
net/batman-adv/icmp_socket.c | 2 ++
net/batman-adv/icmp_socket.h | 2 ++
net/batman-adv/log.c | 2 ++
net/batman-adv/log.h | 2 ++
net/batman-adv/main.c | 2 ++
net/batman-adv/main.h | 2 ++
net/batman-adv/multicast.c | 2 ++
net/batman-adv/multicast.h | 2 ++
net/batman-adv/netlink.c | 2 ++
net/batman-adv/netlink.h | 2 ++
net/batman-adv/network-coding.c | 2 ++
net/batman-adv/network-coding.h | 2 ++
net/batman-adv/originator.c | 2 ++
net/batman-adv/originator.h | 2 ++
net/batman-adv/packet.h | 2 ++
net/batman-adv/routing.c | 2 ++
net/batman-adv/routing.h | 2 ++
net/batman-adv/send.c | 2 ++
net/batman-adv/send.h | 2 ++
net/batman-adv/soft-interface.c | 2 ++
net/batman-adv/soft-interface.h | 2 ++
net/batman-adv/sysfs.c | 2 ++
net/batman-adv/sysfs.h | 2 ++
net/batman-adv/tp_meter.c | 2 ++
net/batman-adv/tp_meter.h | 2 ++
net/batman-adv/translation-table.c | 2 ++
net/batman-adv/translation-table.h | 2 ++
net/batman-adv/tvlv.c | 2 ++
net/batman-adv/tvlv.h | 2 ++
net/batman-adv/types.h | 2 ++
85 files changed, 168 insertions(+)
diff --git a/Makefile b/Makefile
index 1eb6821d..e40f26a5 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
+# License-Filename: LICENSES/preferred/GPL-2.0
# read README.external for more information about the configuration
# batman-adv DebugFS entries:
diff --git a/compat-include/linux/average.h b/compat-include/linux/average.h
index a1e3c254..b5a3d3d7 100644
--- a/compat-include/linux/average.h
+++ b/compat-include/linux/average.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/cache.h b/compat-include/linux/cache.h
index dc2d43cc..11ba7c6b 100644
--- a/compat-include/linux/cache.h
+++ b/compat-include/linux/cache.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/etherdevice.h b/compat-include/linux/etherdevice.h
index 45a079bd..58bab019 100644
--- a/compat-include/linux/etherdevice.h
+++ b/compat-include/linux/etherdevice.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/ethtool.h b/compat-include/linux/ethtool.h
index 05aee4df..b802e9ca 100644
--- a/compat-include/linux/ethtool.h
+++ b/compat-include/linux/ethtool.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/export.h b/compat-include/linux/export.h
index 59fa08f8..e786e1c8 100644
--- a/compat-include/linux/export.h
+++ b/compat-include/linux/export.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/genetlink.h b/compat-include/linux/genetlink.h
index 4d2eb8a1..90e8414f 100644
--- a/compat-include/linux/genetlink.h
+++ b/compat-include/linux/genetlink.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/if_ether.h b/compat-include/linux/if_ether.h
index a4064b64..3c2532c6 100644
--- a/compat-include/linux/if_ether.h
+++ b/compat-include/linux/if_ether.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/if_vlan.h b/compat-include/linux/if_vlan.h
index 255886c3..3114e67c 100644
--- a/compat-include/linux/if_vlan.h
+++ b/compat-include/linux/if_vlan.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/kernel.h b/compat-include/linux/kernel.h
index 4cbc51dc..c6cf8773 100644
--- a/compat-include/linux/kernel.h
+++ b/compat-include/linux/kernel.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/kref.h b/compat-include/linux/kref.h
index a30657ca..f92ae695 100644
--- a/compat-include/linux/kref.h
+++ b/compat-include/linux/kref.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/list.h b/compat-include/linux/list.h
index 1053a4d1..ea071bf8 100644
--- a/compat-include/linux/list.h
+++ b/compat-include/linux/list.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/net.h b/compat-include/linux/net.h
index 0747eda6..e5636601 100644
--- a/compat-include/linux/net.h
+++ b/compat-include/linux/net.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/netdev_features.h b/compat-include/linux/netdev_features.h
index aafba75b..ce85956f 100644
--- a/compat-include/linux/netdev_features.h
+++ b/compat-include/linux/netdev_features.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h
index c29d6d21..6bbf8d8b 100644
--- a/compat-include/linux/netdevice.h
+++ b/compat-include/linux/netdevice.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/netlink.h b/compat-include/linux/netlink.h
index 085078ca..cbc5577d 100644
--- a/compat-include/linux/netlink.h
+++ b/compat-include/linux/netlink.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/random.h b/compat-include/linux/random.h
index c5eae964..19d445e6 100644
--- a/compat-include/linux/random.h
+++ b/compat-include/linux/random.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/rculist.h b/compat-include/linux/rculist.h
index 47ac3c64..0f3eec38 100644
--- a/compat-include/linux/rculist.h
+++ b/compat-include/linux/rculist.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/seq_file.h b/compat-include/linux/seq_file.h
index 3e8dbb47..6a70f0b6 100644
--- a/compat-include/linux/seq_file.h
+++ b/compat-include/linux/seq_file.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/skbuff.h b/compat-include/linux/skbuff.h
index 03765c62..f60247bd 100644
--- a/compat-include/linux/skbuff.h
+++ b/compat-include/linux/skbuff.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/linux/slab.h b/compat-include/linux/slab.h
index 3dc1b916..3afd0330 100644
--- a/compat-include/linux/slab.h
+++ b/compat-include/linux/slab.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h
index 100fa870..66bec7aa 100644
--- a/compat-include/net/genetlink.h
+++ b/compat-include/net/genetlink.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/compat-sources/net/core/skbuff.c b/compat-sources/net/core/skbuff.c
index 40c9e8b9..a130b0ee 100644
--- a/compat-sources/net/core/skbuff.c
+++ b/compat-sources/net/core/skbuff.c
@@ -30,6 +30,8 @@
* 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.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include <linux/in6.h>
diff --git a/compat-sources/net/ipv4/igmp.c b/compat-sources/net/ipv4/igmp.c
index 457a05ea..e8439a03 100644
--- a/compat-sources/net/ipv4/igmp.c
+++ b/compat-sources/net/ipv4/igmp.c
@@ -68,6 +68,8 @@
* Alexey Kuznetsov: Accordance to igmp-v2-06 draft.
* David L Stevens: IGMPv3 support, with help from
* Vinay Kulkarni
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include <linux/igmp.h>
diff --git a/compat-sources/net/ipv6/mcast_snoop.c b/compat-sources/net/ipv6/mcast_snoop.c
index 3f46ed30..fca0bbfa 100644
--- a/compat-sources/net/ipv6/mcast_snoop.c
+++ b/compat-sources/net/ipv6/mcast_snoop.c
@@ -13,6 +13,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
*
* Based on the MLD support added to br_multicast.c by YOSHIFUJI Hideaki.
*/
diff --git a/compat.h b/compat.h
index c10ad589..8acfc724 100644
--- a/compat.h
+++ b/compat.h
@@ -14,6 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
* This file contains macros for maintaining compatibility with older versions
* of the Linux kernel.
*/
diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile
index 915987bc..f70dbd8a 100644
--- a/net/batman-adv/Makefile
+++ b/net/batman-adv/Makefile
@@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
+# License-Filename: LICENSES/preferred/GPL-2.0
obj-$(CONFIG_BATMAN_ADV) += batman-adv.o
batman-adv-y += bat_algo.o
diff --git a/net/batman-adv/bat_algo.c b/net/batman-adv/bat_algo.c
index 44fd073b..921700ab 100644
--- a/net/batman-adv/bat_algo.c
+++ b/net/batman-adv/bat_algo.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "main.h"
diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h
index 29f6312f..78836cf3 100644
--- a/net/batman-adv/bat_algo.h
+++ b/net/batman-adv/bat_algo.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_BAT_ALGO_H_
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 1b659ab6..96bc5d46 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "bat_iv_ogm.h"
diff --git a/net/batman-adv/bat_iv_ogm.h b/net/batman-adv/bat_iv_ogm.h
index ae2ab526..62e5ff65 100644
--- a/net/batman-adv/bat_iv_ogm.h
+++ b/net/batman-adv/bat_iv_ogm.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _BATMAN_ADV_BATADV_IV_OGM_H_
diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
index 341ceab8..91c4b64f 100644
--- a/net/batman-adv/bat_v.c
+++ b/net/batman-adv/bat_v.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "bat_v.h"
diff --git a/net/batman-adv/bat_v.h b/net/batman-adv/bat_v.h
index dd7c4b64..eb14b048 100644
--- a/net/batman-adv/bat_v.h
+++ b/net/batman-adv/bat_v.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_BAT_V_H_
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index 1de992c5..ab10da9a 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "bat_v_elp.h"
diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h
index 376ead28..6edab11e 100644
--- a/net/batman-adv/bat_v_elp.h
+++ b/net/batman-adv/bat_v_elp.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_BAT_V_ELP_H_
diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c
index c251445a..f63a6f82 100644
--- a/net/batman-adv/bat_v_ogm.c
+++ b/net/batman-adv/bat_v_ogm.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "bat_v_ogm.h"
diff --git a/net/batman-adv/bat_v_ogm.h b/net/batman-adv/bat_v_ogm.h
index 2068770b..31e37733 100644
--- a/net/batman-adv/bat_v_ogm.h
+++ b/net/batman-adv/bat_v_ogm.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _BATMAN_ADV_BATADV_V_OGM_H_
diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c
index 2b070c7e..260059b0 100644
--- a/net/batman-adv/bitarray.c
+++ b/net/batman-adv/bitarray.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "bitarray.h"
diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h
index cc262c9d..4a36989a 100644
--- a/net/batman-adv/bitarray.h
+++ b/net/batman-adv/bitarray.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_BITARRAY_H_
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index cdd8e8e4..fd91fd67 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "bridge_loop_avoidance.h"
diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h
index 23477574..67e5d0cb 100644
--- a/net/batman-adv/bridge_loop_avoidance.h
+++ b/net/batman-adv/bridge_loop_avoidance.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_BLA_H_
diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c
index e32ad47c..563f2614 100644
--- a/net/batman-adv/debugfs.c
+++ b/net/batman-adv/debugfs.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "debugfs.h"
diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h
index 9c5d4a65..555f62a0 100644
--- a/net/batman-adv/debugfs.h
+++ b/net/batman-adv/debugfs.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_DEBUGFS_H_
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index 760c0de7..8590e7bf 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "distributed-arp-table.h"
diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h
index ec364a3c..1e5a8f76 100644
--- a/net/batman-adv/distributed-arp-table.h
+++ b/net/batman-adv/distributed-arp-table.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_
diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
index a98cf110..72ba5689 100644
--- a/net/batman-adv/fragmentation.c
+++ b/net/batman-adv/fragmentation.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "fragmentation.h"
diff --git a/net/batman-adv/fragmentation.h b/net/batman-adv/fragmentation.h
index 1a2d6c30..dd9b28f2 100644
--- a/net/batman-adv/fragmentation.h
+++ b/net/batman-adv/fragmentation.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_FRAGMENTATION_H_
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 10d521f0..974cee04 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "gateway_client.h"
diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h
index 3baa3d46..5d3e4e5c 100644
--- a/net/batman-adv/gateway_client.h
+++ b/net/batman-adv/gateway_client.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_GATEWAY_CLIENT_H_
diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c
index 2c26039c..b08b8e48 100644
--- a/net/batman-adv/gateway_common.c
+++ b/net/batman-adv/gateway_common.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "gateway_common.h"
diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h
index 0a6a97d2..3f6d9c9c 100644
--- a/net/batman-adv/gateway_common.h
+++ b/net/batman-adv/gateway_common.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_GATEWAY_COMMON_H_
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 4e3d5340..cd5e8e57 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "hard-interface.h"
diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h
index 9f9890ff..c56c4e60 100644
--- a/net/batman-adv/hard-interface.h
+++ b/net/batman-adv/hard-interface.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_HARD_INTERFACE_H_
diff --git a/net/batman-adv/hash.c b/net/batman-adv/hash.c
index b5f7e139..d7833f7f 100644
--- a/net/batman-adv/hash.c
+++ b/net/batman-adv/hash.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "hash.h"
diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h
index 0c905e91..ffde3e61 100644
--- a/net/batman-adv/hash.h
+++ b/net/batman-adv/hash.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_HASH_H_
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index bded3112..d46b7fd0 100644
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "icmp_socket.h"
diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h
index f3fec40a..41531641 100644
--- a/net/batman-adv/icmp_socket.h
+++ b/net/batman-adv/icmp_socket.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_
diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c
index 4ef4bde2..c2e541fd 100644
--- a/net/batman-adv/log.c
+++ b/net/batman-adv/log.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "log.h"
diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h
index 65ce97ef..7b251b45 100644
--- a/net/batman-adv/log.h
+++ b/net/batman-adv/log.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_LOG_H_
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 4daed7ad..d6d0bbe6 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "main.h"
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index edb2f239..bc518dca 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_MAIN_H_
diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
index e553a877..bbd6013f 100644
--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "multicast.h"
diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h
index 2a78cdda..026dc285 100644
--- a/net/batman-adv/multicast.h
+++ b/net/batman-adv/multicast.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_MULTICAST_H_
diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index ab13b4d5..5d588b7b 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "netlink.h"
diff --git a/net/batman-adv/netlink.h b/net/batman-adv/netlink.h
index f1cd8c5d..f6f33e02 100644
--- a/net/batman-adv/netlink.h
+++ b/net/batman-adv/netlink.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_NETLINK_H_
diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index 3604d789..ba41be15 100644
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "network-coding.h"
diff --git a/net/batman-adv/network-coding.h b/net/batman-adv/network-coding.h
index c66efb81..b78dcbaa 100644
--- a/net/batman-adv/network-coding.h
+++ b/net/batman-adv/network-coding.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_NETWORK_CODING_H_
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 2967b86c..889263ce 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "originator.h"
diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h
index d94220a6..9b0c6f5a 100644
--- a/net/batman-adv/originator.h
+++ b/net/batman-adv/originator.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_ORIGINATOR_H_
diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index 8e8a5db1..f1fd0311 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_PACKET_H_
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 40d9bf3e..1d27e798 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "routing.h"
diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h
index 5ede16c3..0a24d83e 100644
--- a/net/batman-adv/routing.h
+++ b/net/batman-adv/routing.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_ROUTING_H_
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index 7895323f..cc235db8 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "send.h"
diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h
index a16b34f4..5e3c1428 100644
--- a/net/batman-adv/send.h
+++ b/net/batman-adv/send.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_SEND_H_
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 9f673cdf..7384de4f 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "soft-interface.h"
diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h
index 639c3abb..85708f95 100644
--- a/net/batman-adv/soft-interface.h
+++ b/net/batman-adv/soft-interface.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_
diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
index aa187fd4..2e11d6d5 100644
--- a/net/batman-adv/sysfs.c
+++ b/net/batman-adv/sysfs.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "sysfs.h"
diff --git a/net/batman-adv/sysfs.h b/net/batman-adv/sysfs.h
index e487412e..35a6f8fa 100644
--- a/net/batman-adv/sysfs.h
+++ b/net/batman-adv/sysfs.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_SYSFS_H_
diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index 4b90033f..b6c9ea0c 100644
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "tp_meter.h"
diff --git a/net/batman-adv/tp_meter.h b/net/batman-adv/tp_meter.h
index a8ada5c1..f4fc6f31 100644
--- a/net/batman-adv/tp_meter.h
+++ b/net/batman-adv/tp_meter.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_TP_METER_H_
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 8a3ce79b..98d688a4 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "translation-table.h"
diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h
index 411d5861..2b4ffd9e 100644
--- a/net/batman-adv/translation-table.h
+++ b/net/batman-adv/translation-table.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_
diff --git a/net/batman-adv/tvlv.c b/net/batman-adv/tvlv.c
index 1d9e267c..a310341d 100644
--- a/net/batman-adv/tvlv.c
+++ b/net/batman-adv/tvlv.c
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#include "main.h"
diff --git a/net/batman-adv/tvlv.h b/net/batman-adv/tvlv.h
index 4d01400a..314c77ec 100644
--- a/net/batman-adv/tvlv.h
+++ b/net/batman-adv/tvlv.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_TVLV_H_
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index a6279586..e2d1d1f1 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -13,6 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
*/
#ifndef _NET_BATMAN_ADV_TYPES_H_
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [B.A.T.M.A.N.] [PATCH 3/9] batman-adv: Add SPDX license identifier above copyright header
2017-11-19 14:05 [B.A.T.M.A.N.] [PATCH 0/9] batman-adv: License cleanup Sven Eckelmann
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 1/9] batman-adv: Add GPL-2.0 as Linux's LICENSES/preferred/GPL-2.0 Sven Eckelmann
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 2/9] batman-adv: Add License-Filename to GPL-2.0 files Sven Eckelmann
@ 2017-11-19 14:05 ` Sven Eckelmann
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 4/9] batman-adv: Add SPDX license identifier to batman-adv.rst Sven Eckelmann
` (6 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Sven Eckelmann @ 2017-11-19 14:05 UTC (permalink / raw)
To: b.a.t.m.a.n
The "Linux kernel licensing rules" require that each file has a SPDX
license identifier as first line (and sometimes as second line).
The FSFE REUSE practices [1] would also require the same tags but have no
restrictions on the placement in the source file. Using the "Linux kernel
licensing rules" is therefore also fulfilling the FSFE REUSE practices
requirements at the same time.
[1] https://reuse.software/practices/
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Makefile | 2 +-
compat-include/linux/average.h | 1 +
compat-include/linux/cache.h | 1 +
compat-include/linux/etherdevice.h | 1 +
compat-include/linux/ethtool.h | 1 +
compat-include/linux/export.h | 1 +
compat-include/linux/genetlink.h | 1 +
compat-include/linux/if_ether.h | 1 +
compat-include/linux/if_vlan.h | 1 +
compat-include/linux/kernel.h | 1 +
compat-include/linux/kref.h | 1 +
compat-include/linux/list.h | 1 +
compat-include/linux/net.h | 1 +
compat-include/linux/netdev_features.h | 1 +
compat-include/linux/netdevice.h | 1 +
compat-include/linux/netlink.h | 1 +
compat-include/linux/random.h | 1 +
compat-include/linux/rculist.h | 1 +
compat-include/linux/seq_file.h | 1 +
compat-include/linux/skbuff.h | 1 +
compat-include/linux/slab.h | 1 +
compat-include/net/genetlink.h | 1 +
compat-sources/net/core/skbuff.c | 1 +
compat-sources/net/ipv4/igmp.c | 1 +
compat-sources/net/ipv6/mcast_snoop.c | 1 +
compat.h | 1 +
include/uapi/linux/batman_adv.h | 1 +
net/batman-adv/Makefile | 2 +-
net/batman-adv/bat_algo.c | 1 +
net/batman-adv/bat_algo.h | 1 +
net/batman-adv/bat_iv_ogm.c | 1 +
net/batman-adv/bat_iv_ogm.h | 1 +
net/batman-adv/bat_v.c | 1 +
net/batman-adv/bat_v.h | 1 +
net/batman-adv/bat_v_elp.c | 1 +
net/batman-adv/bat_v_elp.h | 1 +
net/batman-adv/bat_v_ogm.c | 1 +
net/batman-adv/bat_v_ogm.h | 1 +
net/batman-adv/bitarray.c | 1 +
net/batman-adv/bitarray.h | 1 +
net/batman-adv/bridge_loop_avoidance.c | 1 +
net/batman-adv/bridge_loop_avoidance.h | 1 +
net/batman-adv/debugfs.c | 1 +
net/batman-adv/debugfs.h | 1 +
net/batman-adv/distributed-arp-table.c | 1 +
net/batman-adv/distributed-arp-table.h | 1 +
net/batman-adv/fragmentation.c | 1 +
net/batman-adv/fragmentation.h | 1 +
net/batman-adv/gateway_client.c | 1 +
net/batman-adv/gateway_client.h | 1 +
net/batman-adv/gateway_common.c | 1 +
net/batman-adv/gateway_common.h | 1 +
net/batman-adv/hard-interface.c | 1 +
net/batman-adv/hard-interface.h | 1 +
net/batman-adv/hash.c | 1 +
net/batman-adv/hash.h | 1 +
net/batman-adv/icmp_socket.c | 1 +
net/batman-adv/icmp_socket.h | 1 +
net/batman-adv/log.c | 1 +
net/batman-adv/log.h | 1 +
net/batman-adv/main.c | 1 +
net/batman-adv/main.h | 1 +
net/batman-adv/multicast.c | 1 +
net/batman-adv/multicast.h | 1 +
net/batman-adv/netlink.c | 1 +
net/batman-adv/netlink.h | 1 +
net/batman-adv/network-coding.c | 1 +
net/batman-adv/network-coding.h | 1 +
net/batman-adv/originator.c | 1 +
net/batman-adv/originator.h | 1 +
net/batman-adv/packet.h | 1 +
net/batman-adv/routing.c | 1 +
net/batman-adv/routing.h | 1 +
net/batman-adv/send.c | 1 +
net/batman-adv/send.h | 1 +
net/batman-adv/soft-interface.c | 1 +
net/batman-adv/soft-interface.h | 1 +
net/batman-adv/sysfs.c | 1 +
net/batman-adv/sysfs.h | 1 +
net/batman-adv/tp_meter.c | 1 +
net/batman-adv/tp_meter.h | 1 +
net/batman-adv/translation-table.c | 1 +
net/batman-adv/translation-table.h | 1 +
net/batman-adv/tvlv.c | 1 +
net/batman-adv/tvlv.h | 1 +
net/batman-adv/types.h | 1 +
86 files changed, 86 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index e40f26a5..7a5cb243 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#
+# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
#
# Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/average.h b/compat-include/linux/average.h
index b5a3d3d7..2bbaf97f 100644
--- a/compat-include/linux/average.h
+++ b/compat-include/linux/average.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/cache.h b/compat-include/linux/cache.h
index 11ba7c6b..ea3b98a7 100644
--- a/compat-include/linux/cache.h
+++ b/compat-include/linux/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/etherdevice.h b/compat-include/linux/etherdevice.h
index 58bab019..fbeaa677 100644
--- a/compat-include/linux/etherdevice.h
+++ b/compat-include/linux/etherdevice.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/ethtool.h b/compat-include/linux/ethtool.h
index b802e9ca..9259614a 100644
--- a/compat-include/linux/ethtool.h
+++ b/compat-include/linux/ethtool.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors:
*
* Antonio Quartulli
diff --git a/compat-include/linux/export.h b/compat-include/linux/export.h
index e786e1c8..39679142 100644
--- a/compat-include/linux/export.h
+++ b/compat-include/linux/export.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/genetlink.h b/compat-include/linux/genetlink.h
index 90e8414f..0abaeb96 100644
--- a/compat-include/linux/genetlink.h
+++ b/compat-include/linux/genetlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/if_ether.h b/compat-include/linux/if_ether.h
index 3c2532c6..71001820 100644
--- a/compat-include/linux/if_ether.h
+++ b/compat-include/linux/if_ether.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/if_vlan.h b/compat-include/linux/if_vlan.h
index 3114e67c..994a855d 100644
--- a/compat-include/linux/if_vlan.h
+++ b/compat-include/linux/if_vlan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/kernel.h b/compat-include/linux/kernel.h
index c6cf8773..26938cd8 100644
--- a/compat-include/linux/kernel.h
+++ b/compat-include/linux/kernel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/kref.h b/compat-include/linux/kref.h
index f92ae695..124173ff 100644
--- a/compat-include/linux/kref.h
+++ b/compat-include/linux/kref.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/list.h b/compat-include/linux/list.h
index ea071bf8..776ef03c 100644
--- a/compat-include/linux/list.h
+++ b/compat-include/linux/list.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/net.h b/compat-include/linux/net.h
index e5636601..0dbfd913 100644
--- a/compat-include/linux/net.h
+++ b/compat-include/linux/net.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/netdev_features.h b/compat-include/linux/netdev_features.h
index ce85956f..28510994 100644
--- a/compat-include/linux/netdev_features.h
+++ b/compat-include/linux/netdev_features.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h
index 6bbf8d8b..1f3b9c47 100644
--- a/compat-include/linux/netdevice.h
+++ b/compat-include/linux/netdevice.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/netlink.h b/compat-include/linux/netlink.h
index cbc5577d..578d2efc 100644
--- a/compat-include/linux/netlink.h
+++ b/compat-include/linux/netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/random.h b/compat-include/linux/random.h
index 19d445e6..a88e6fd9 100644
--- a/compat-include/linux/random.h
+++ b/compat-include/linux/random.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/rculist.h b/compat-include/linux/rculist.h
index 0f3eec38..bc2db8ec 100644
--- a/compat-include/linux/rculist.h
+++ b/compat-include/linux/rculist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/seq_file.h b/compat-include/linux/seq_file.h
index 6a70f0b6..e98f41bb 100644
--- a/compat-include/linux/seq_file.h
+++ b/compat-include/linux/seq_file.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/skbuff.h b/compat-include/linux/skbuff.h
index f60247bd..0b641d67 100644
--- a/compat-include/linux/skbuff.h
+++ b/compat-include/linux/skbuff.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/linux/slab.h b/compat-include/linux/slab.h
index 3afd0330..33de121b 100644
--- a/compat-include/linux/slab.h
+++ b/compat-include/linux/slab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h
index 66bec7aa..f69fd148 100644
--- a/compat-include/net/genetlink.h
+++ b/compat-include/net/genetlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/compat-sources/net/core/skbuff.c b/compat-sources/net/core/skbuff.c
index a130b0ee..f62e31af 100644
--- a/compat-sources/net/core/skbuff.c
+++ b/compat-sources/net/core/skbuff.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Routines having to do with the 'struct sk_buff' memory handlers.
*
diff --git a/compat-sources/net/ipv4/igmp.c b/compat-sources/net/ipv4/igmp.c
index e8439a03..d6e08c73 100644
--- a/compat-sources/net/ipv4/igmp.c
+++ b/compat-sources/net/ipv4/igmp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Linux NET3: Internet Group Management Protocol [IGMP]
*
diff --git a/compat-sources/net/ipv6/mcast_snoop.c b/compat-sources/net/ipv6/mcast_snoop.c
index fca0bbfa..5e500f73 100644
--- a/compat-sources/net/ipv6/mcast_snoop.c
+++ b/compat-sources/net/ipv6/mcast_snoop.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2010: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
* Copyright (C) 2015: Linus Lüssing <linus.luessing@c0d3.blue>
*
diff --git a/compat.h b/compat.h
index 8acfc724..15996d77 100644
--- a/compat.h
+++ b/compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h
index efd641c8..fb453382 100644
--- a/include/uapi/linux/batman_adv.h
+++ b/include/uapi/linux/batman_adv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ISC */
/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors:
*
* Matthias Schiffer
diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile
index f70dbd8a..93165ca0 100644
--- a/net/batman-adv/Makefile
+++ b/net/batman-adv/Makefile
@@ -1,4 +1,4 @@
-#
+# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
#
# Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/bat_algo.c b/net/batman-adv/bat_algo.c
index 921700ab..36407f5b 100644
--- a/net/batman-adv/bat_algo.c
+++ b/net/batman-adv/bat_algo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h
index 78836cf3..5c0a260e 100644
--- a/net/batman-adv/bat_algo.h
+++ b/net/batman-adv/bat_algo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Linus Lüssing
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 96bc5d46..4de912c8 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/bat_iv_ogm.h b/net/batman-adv/bat_iv_ogm.h
index 62e5ff65..1646664d 100644
--- a/net/batman-adv/bat_iv_ogm.h
+++ b/net/batman-adv/bat_iv_ogm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
index 91c4b64f..c2eac642 100644
--- a/net/batman-adv/bat_v.c
+++ b/net/batman-adv/bat_v.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors:
*
* Linus Lüssing, Marek Lindner
diff --git a/net/batman-adv/bat_v.h b/net/batman-adv/bat_v.h
index eb14b048..060e088f 100644
--- a/net/batman-adv/bat_v.h
+++ b/net/batman-adv/bat_v.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Linus Lüssing
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index ab10da9a..1aa175a4 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors:
*
* Linus Lüssing, Marek Lindner
diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h
index 6edab11e..2d6f6611 100644
--- a/net/batman-adv/bat_v_elp.h
+++ b/net/batman-adv/bat_v_elp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors:
*
* Linus Lüssing, Marek Lindner
diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c
index f63a6f82..0ce2d95a 100644
--- a/net/batman-adv/bat_v_ogm.c
+++ b/net/batman-adv/bat_v_ogm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors:
*
* Antonio Quartulli
diff --git a/net/batman-adv/bat_v_ogm.h b/net/batman-adv/bat_v_ogm.h
index 31e37733..31066c51 100644
--- a/net/batman-adv/bat_v_ogm.h
+++ b/net/batman-adv/bat_v_ogm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors:
*
* Antonio Quartulli
diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c
index 260059b0..8b0d2dc1 100644
--- a/net/batman-adv/bitarray.c
+++ b/net/batman-adv/bitarray.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h
index 4a36989a..69e8fff5 100644
--- a/net/batman-adv/bitarray.h
+++ b/net/batman-adv/bitarray.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index fd91fd67..f5b917b6 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h
index 67e5d0cb..4c9497b4 100644
--- a/net/batman-adv/bridge_loop_avoidance.h
+++ b/net/batman-adv/bridge_loop_avoidance.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich
diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c
index 563f2614..e5f76c76 100644
--- a/net/batman-adv/debugfs.c
+++ b/net/batman-adv/debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner
diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h
index 555f62a0..85bd864c 100644
--- a/net/batman-adv/debugfs.h
+++ b/net/batman-adv/debugfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index 8590e7bf..e708fda4 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors:
*
* Antonio Quartulli
diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h
index 1e5a8f76..beedd7d5 100644
--- a/net/batman-adv/distributed-arp-table.h
+++ b/net/batman-adv/distributed-arp-table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors:
*
* Antonio Quartulli
diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
index 72ba5689..c49ca050 100644
--- a/net/batman-adv/fragmentation.c
+++ b/net/batman-adv/fragmentation.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors:
*
* Martin Hundebøll <martin@hundeboll.net>
diff --git a/net/batman-adv/fragmentation.h b/net/batman-adv/fragmentation.h
index dd9b28f2..a2ed3b47 100644
--- a/net/batman-adv/fragmentation.h
+++ b/net/batman-adv/fragmentation.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors:
*
* Martin Hundebøll <martin@hundeboll.net>
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index 974cee04..b962430a 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner
diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h
index 5d3e4e5c..c34c75c1 100644
--- a/net/batman-adv/gateway_client.h
+++ b/net/batman-adv/gateway_client.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner
diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c
index b08b8e48..ddef07af 100644
--- a/net/batman-adv/gateway_common.c
+++ b/net/batman-adv/gateway_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner
diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h
index 3f6d9c9c..a1fb66f9 100644
--- a/net/batman-adv/gateway_common.h
+++ b/net/batman-adv/gateway_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index cd5e8e57..464c98f2 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h
index c56c4e60..d1760649 100644
--- a/net/batman-adv/hard-interface.h
+++ b/net/batman-adv/hard-interface.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/hash.c b/net/batman-adv/hash.c
index d7833f7f..33fd8fae 100644
--- a/net/batman-adv/hash.c
+++ b/net/batman-adv/hash.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h
index ffde3e61..55819b20 100644
--- a/net/batman-adv/hash.h
+++ b/net/batman-adv/hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors:
*
* Simon Wunderlich, Marek Lindner
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index d46b7fd0..ca51c488 100644
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner
diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h
index 41531641..c904f20e 100644
--- a/net/batman-adv/icmp_socket.h
+++ b/net/batman-adv/icmp_socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner
diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c
index c2e541fd..78e4dddb 100644
--- a/net/batman-adv/log.c
+++ b/net/batman-adv/log.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner
diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h
index 7b251b45..f880d874 100644
--- a/net/batman-adv/log.h
+++ b/net/batman-adv/log.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index d6d0bbe6..6b3db9b4 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index bc518dca..6cfbba52 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
index bbd6013f..3cef5a76 100644
--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2014-2017 B.A.T.M.A.N. contributors:
*
* Linus Lüssing
diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h
index 026dc285..ef098ce3 100644
--- a/net/batman-adv/multicast.h
+++ b/net/batman-adv/multicast.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2014-2017 B.A.T.M.A.N. contributors:
*
* Linus Lüssing
diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index 5d588b7b..d70d0e2d 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors:
*
* Matthias Schiffer
diff --git a/net/batman-adv/netlink.h b/net/batman-adv/netlink.h
index f6f33e02..f2aa2fcc 100644
--- a/net/batman-adv/netlink.h
+++ b/net/batman-adv/netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors:
*
* Matthias Schiffer
diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index ba41be15..c3d65af3 100644
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors:
*
* Martin Hundebøll, Jeppe Ledet-Pedersen
diff --git a/net/batman-adv/network-coding.h b/net/batman-adv/network-coding.h
index b78dcbaa..80a88ef0 100644
--- a/net/batman-adv/network-coding.h
+++ b/net/batman-adv/network-coding.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors:
*
* Martin Hundebøll, Jeppe Ledet-Pedersen
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index 889263ce..f365de37 100644
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h
index 9b0c6f5a..220c12f2 100644
--- a/net/batman-adv/originator.h
+++ b/net/batman-adv/originator.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index f1fd0311..d58288c3 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 1d27e798..0acfa6ee 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h
index 0a24d83e..5a92e883 100644
--- a/net/batman-adv/routing.h
+++ b/net/batman-adv/routing.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index cc235db8..a9c505b7 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h
index 5e3c1428..f6ead20b 100644
--- a/net/batman-adv/send.h
+++ b/net/batman-adv/send.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 7384de4f..178d998b 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h
index 85708f95..40123cb4 100644
--- a/net/batman-adv/soft-interface.h
+++ b/net/batman-adv/soft-interface.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner
diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
index 2e11d6d5..e54a662b 100644
--- a/net/batman-adv/sysfs.c
+++ b/net/batman-adv/sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner
diff --git a/net/batman-adv/sysfs.h b/net/batman-adv/sysfs.h
index 35a6f8fa..0a3d41d5 100644
--- a/net/batman-adv/sysfs.h
+++ b/net/batman-adv/sysfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2010-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner
diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index b6c9ea0c..f890319b 100644
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors:
*
* Edo Monticelli, Antonio Quartulli
diff --git a/net/batman-adv/tp_meter.h b/net/batman-adv/tp_meter.h
index f4fc6f31..cb19c283 100644
--- a/net/batman-adv/tp_meter.h
+++ b/net/batman-adv/tp_meter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors:
*
* Edo Monticelli, Antonio Quartulli
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 98d688a4..efa4ef02 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich, Antonio Quartulli
diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h
index 2b4ffd9e..21273aea 100644
--- a/net/batman-adv/translation-table.h
+++ b/net/batman-adv/translation-table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich, Antonio Quartulli
diff --git a/net/batman-adv/tvlv.c b/net/batman-adv/tvlv.c
index a310341d..fcaa7bd4 100644
--- a/net/batman-adv/tvlv.c
+++ b/net/batman-adv/tvlv.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/tvlv.h b/net/batman-adv/tvlv.h
index 314c77ec..661467be 100644
--- a/net/batman-adv/tvlv.h
+++ b/net/batman-adv/tvlv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index e2d1d1f1..a00079fb 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
*
* Marek Lindner, Simon Wunderlich
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [B.A.T.M.A.N.] [PATCH 4/9] batman-adv: Add SPDX license identifier to batman-adv.rst
2017-11-19 14:05 [B.A.T.M.A.N.] [PATCH 0/9] batman-adv: License cleanup Sven Eckelmann
` (2 preceding siblings ...)
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 3/9] batman-adv: Add SPDX license identifier above copyright header Sven Eckelmann
@ 2017-11-19 14:05 ` Sven Eckelmann
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 5/9] batman-adv: Add license header to Kconfig Sven Eckelmann
` (5 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Sven Eckelmann @ 2017-11-19 14:05 UTC (permalink / raw)
To: b.a.t.m.a.n
The "Linux licensing rules" require that also the restructuredText files
are marked with the appropriate SPDX license identifier.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Documentation/networking/batman-adv.rst | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/networking/batman-adv.rst b/Documentation/networking/batman-adv.rst
index a342b2cc..245fb6c0 100644
--- a/Documentation/networking/batman-adv.rst
+++ b/Documentation/networking/batman-adv.rst
@@ -1,3 +1,5 @@
+.. SPDX-License-Identifier: GPL-2.0
+
==========
batman-adv
==========
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [B.A.T.M.A.N.] [PATCH 5/9] batman-adv: Add license header to Kconfig
2017-11-19 14:05 [B.A.T.M.A.N.] [PATCH 0/9] batman-adv: License cleanup Sven Eckelmann
` (3 preceding siblings ...)
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 4/9] batman-adv: Add SPDX license identifier to batman-adv.rst Sven Eckelmann
@ 2017-11-19 14:05 ` Sven Eckelmann
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 6/9] batman-adv: Add license headers to compat files Sven Eckelmann
` (4 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Sven Eckelmann @ 2017-11-19 14:05 UTC (permalink / raw)
To: b.a.t.m.a.n
The last remaining file without license notice and/or SPDX license
identifier under net/batman-adv/ is the Kconfig. It should have been
licensed under the same conditions as the rest of batman-adv and the
Makefile which uses the CONFIG_* variables from Kconfig.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
net/batman-adv/Kconfig | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index b73b96a2..73d84707 100644
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -1,3 +1,22 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
+#
+# Marek Lindner, Simon Wunderlich
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public
+# License as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# License-Filename: LICENSES/preferred/GPL-2.0
+
#
# B.A.T.M.A.N meshing protocol
#
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [B.A.T.M.A.N.] [PATCH 6/9] batman-adv: Add license headers to compat files
2017-11-19 14:05 [B.A.T.M.A.N.] [PATCH 0/9] batman-adv: License cleanup Sven Eckelmann
` (4 preceding siblings ...)
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 5/9] batman-adv: Add license header to Kconfig Sven Eckelmann
@ 2017-11-19 14:05 ` Sven Eckelmann
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 7/9] batman-adv: Mark remaining files as GPL-2.0 Sven Eckelmann
` (3 subsequent siblings)
9 siblings, 0 replies; 18+ messages in thread
From: Sven Eckelmann @ 2017-11-19 14:05 UTC (permalink / raw)
To: b.a.t.m.a.n
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
compat-include/linux/if_bridge.h | 23 +++++++++++++++++++++++
compat-include/linux/igmp.h | 23 +++++++++++++++++++++++
compat-include/linux/nl80211.h | 23 +++++++++++++++++++++++
compat-include/net/addrconf.h | 23 +++++++++++++++++++++++
compat-include/net/cfg80211.h | 23 +++++++++++++++++++++++
compat-include/net/ip6_checksum.h | 23 +++++++++++++++++++++++
compat-include/net/ipv6.h | 23 +++++++++++++++++++++++
compat-include/uapi/linux/nl80211.h | 23 +++++++++++++++++++++++
compat-patches/README | 2 ++
compat-patches/replacements.sh | 18 ++++++++++++++++++
compat-sources/Makefile | 19 +++++++++++++++++++
gen-compat-autoconf.sh | 18 ++++++++++++++++++
12 files changed, 241 insertions(+)
diff --git a/compat-include/linux/if_bridge.h b/compat-include/linux/if_bridge.h
index 9aae0186..72e7afb3 100644
--- a/compat-include/linux/if_bridge.h
+++ b/compat-include/linux/if_bridge.h
@@ -1,3 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner, Simon Wunderlich
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
+ * This file contains macros for maintaining compatibility with older versions
+ * of the Linux kernel.
+ */
+
#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_IF_BRIDGE_H_
#define _NET_BATMAN_ADV_COMPAT_LINUX_IF_BRIDGE_H_
diff --git a/compat-include/linux/igmp.h b/compat-include/linux/igmp.h
index f61ab79c..7ccf0939 100644
--- a/compat-include/linux/igmp.h
+++ b/compat-include/linux/igmp.h
@@ -1,3 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner, Simon Wunderlich
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
+ * This file contains macros for maintaining compatibility with older versions
+ * of the Linux kernel.
+ */
+
#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_IGMP_H_
#define _NET_BATMAN_ADV_COMPAT_LINUX_IGMP_H_
diff --git a/compat-include/linux/nl80211.h b/compat-include/linux/nl80211.h
index e6654df8..ae0b3726 100644
--- a/compat-include/linux/nl80211.h
+++ b/compat-include/linux/nl80211.h
@@ -1,3 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner, Simon Wunderlich
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
+ * This file contains macros for maintaining compatibility with older versions
+ * of the Linux kernel.
+ */
+
#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_NL80211_H_
#define _NET_BATMAN_ADV_COMPAT_LINUX_NL80211_H_
diff --git a/compat-include/net/addrconf.h b/compat-include/net/addrconf.h
index 69c45d06..9b185bbd 100644
--- a/compat-include/net/addrconf.h
+++ b/compat-include/net/addrconf.h
@@ -1,3 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner, Simon Wunderlich
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
+ * This file contains macros for maintaining compatibility with older versions
+ * of the Linux kernel.
+ */
+
#ifndef _NET_BATMAN_ADV_COMPAT_NET_ADDRCONF_H_
#define _NET_BATMAN_ADV_COMPAT_NET_ADDRCONF_H_
diff --git a/compat-include/net/cfg80211.h b/compat-include/net/cfg80211.h
index 6e0eca3c..475635e2 100644
--- a/compat-include/net/cfg80211.h
+++ b/compat-include/net/cfg80211.h
@@ -1,3 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner, Simon Wunderlich
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
+ * This file contains macros for maintaining compatibility with older versions
+ * of the Linux kernel.
+ */
+
#ifndef _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_
#define _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_
diff --git a/compat-include/net/ip6_checksum.h b/compat-include/net/ip6_checksum.h
index fda0c07d..09f191df 100644
--- a/compat-include/net/ip6_checksum.h
+++ b/compat-include/net/ip6_checksum.h
@@ -1,3 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner, Simon Wunderlich
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
+ * This file contains macros for maintaining compatibility with older versions
+ * of the Linux kernel.
+ */
+
#ifndef _NET_BATMAN_ADV_COMPAT_NET_IP6_CHECKSUM_H_
#define _NET_BATMAN_ADV_COMPAT_NET_IP6_CHECKSUM_H_
diff --git a/compat-include/net/ipv6.h b/compat-include/net/ipv6.h
index 1e190d85..b4a1e18f 100644
--- a/compat-include/net/ipv6.h
+++ b/compat-include/net/ipv6.h
@@ -1,3 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner, Simon Wunderlich
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
+ * This file contains macros for maintaining compatibility with older versions
+ * of the Linux kernel.
+ */
+
#ifndef _NET_BATMAN_ADV_COMPAT_NET_IPV6_H_
#define _NET_BATMAN_ADV_COMPAT_NET_IPV6_H_
diff --git a/compat-include/uapi/linux/nl80211.h b/compat-include/uapi/linux/nl80211.h
index 06f5625a..9b18178e 100644
--- a/compat-include/uapi/linux/nl80211.h
+++ b/compat-include/uapi/linux/nl80211.h
@@ -1,3 +1,26 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner, Simon Wunderlich
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ *
+ * This file contains macros for maintaining compatibility with older versions
+ * of the Linux kernel.
+ */
+
#ifndef _NET_BATMAN_ADV_COMPAT_UAPI_LINUX_NL80211_H_
#define _NET_BATMAN_ADV_COMPAT_UAPI_LINUX_NL80211_H_
diff --git a/compat-patches/README b/compat-patches/README
index 3bbddb3d..ceafb1da 100644
--- a/compat-patches/README
+++ b/compat-patches/README
@@ -1,3 +1,5 @@
+.. SPDX-License-Identifier: GPL-2.0
+
WARNING
=======
diff --git a/compat-patches/replacements.sh b/compat-patches/replacements.sh
index 7dcb953a..021261f5 100755
--- a/compat-patches/replacements.sh
+++ b/compat-patches/replacements.sh
@@ -1,4 +1,22 @@
#! /bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
+#
+# Marek Lindner, Simon Wunderlich
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public
+# License as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# License-Filename: LICENSES/preferred/GPL-2.0
set -e
diff --git a/compat-sources/Makefile b/compat-sources/Makefile
index c8bae49a..5903df92 100644
--- a/compat-sources/Makefile
+++ b/compat-sources/Makefile
@@ -1,3 +1,22 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
+#
+# Marek Lindner, Simon Wunderlich
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public
+# License as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# License-Filename: LICENSES/preferred/GPL-2.0
+
batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += ../../../compat-sources/net/core/skbuff.o
batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += ../../../compat-sources/net/ipv4/igmp.o
batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += ../../../compat-sources/net/ipv6/mcast_snoop.o
diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh
index cf36e558..e598655e 100755
--- a/gen-compat-autoconf.sh
+++ b/gen-compat-autoconf.sh
@@ -1,4 +1,22 @@
#! /bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2007-2017 B.A.T.M.A.N. contributors:
+#
+# Marek Lindner, Simon Wunderlich
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public
+# License as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# License-Filename: LICENSES/preferred/GPL-2.0
set -e
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [B.A.T.M.A.N.] [PATCH 7/9] batman-adv: Mark remaining files as GPL-2.0
2017-11-19 14:05 [B.A.T.M.A.N.] [PATCH 0/9] batman-adv: License cleanup Sven Eckelmann
` (5 preceding siblings ...)
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 6/9] batman-adv: Add license headers to compat files Sven Eckelmann
@ 2017-11-19 14:05 ` Sven Eckelmann
2017-12-01 13:39 ` [B.A.T.M.A.N.] [PATCH v2 " Sven Eckelmann
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: Change batman_adv.h license to MIT Sven Eckelmann
` (2 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Sven Eckelmann @ 2017-11-19 14:05 UTC (permalink / raw)
To: b.a.t.m.a.n
Cc: Sven Eckelmann, Simon Wunderlich, Martin Hundebøll,
Marek Lindner, Linus Lüssing, Antonio Quartulli
Some files were not explicitly marked with any license. It is therefore
assumed that these are licensed under the GPL-2.0. Make this unambiguous by
adding this information direct to the file using the SPDX license
identifier. The FSFE REUSE *.license annotation file is used for files
which don't allow comments.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Cc: Simon Wunderlich <sw@simonwunderlich.de>
Cc: Martin Hundebøll <martin@hundeboll.net>
Cc: Marek Lindner <mareklindner@neomailbox.ch>
Cc: Linus Lüssing <linus.luessing@c0d3.blue>
Cc: Antonio Quartulli <a@unstable.cc>
Feel free to request a different license for these files.
---
.gitattributes | 3 +++
CHANGELOG.license | 2 ++
MAINTAINERS.license | 2 ++
README.external.license | 2 ++
4 files changed, 9 insertions(+)
create mode 100644 CHANGELOG.license
create mode 100644 MAINTAINERS.license
create mode 100644 README.external.license
diff --git a/.gitattributes b/.gitattributes
index 1d2a7e9e..402ecae4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+# License-Filename: LICENSES/preferred/GPL-2.0
+
/.gitignore export-ignore
/.gitattributes export-ignore
*.c diff=cpp
diff --git a/CHANGELOG.license b/CHANGELOG.license
new file mode 100644
index 00000000..a55d70ee
--- /dev/null
+++ b/CHANGELOG.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: GPL-2.0
+License-Filename: LICENSES/preferred/GPL-2.0
diff --git a/MAINTAINERS.license b/MAINTAINERS.license
new file mode 100644
index 00000000..a55d70ee
--- /dev/null
+++ b/MAINTAINERS.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: GPL-2.0
+License-Filename: LICENSES/preferred/GPL-2.0
diff --git a/README.external.license b/README.external.license
new file mode 100644
index 00000000..a55d70ee
--- /dev/null
+++ b/README.external.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: GPL-2.0
+License-Filename: LICENSES/preferred/GPL-2.0
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* [B.A.T.M.A.N.] [PATCH v2 7/9] batman-adv: Mark remaining files as GPL-2.0
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 7/9] batman-adv: Mark remaining files as GPL-2.0 Sven Eckelmann
@ 2017-12-01 13:39 ` Sven Eckelmann
0 siblings, 0 replies; 18+ messages in thread
From: Sven Eckelmann @ 2017-12-01 13:39 UTC (permalink / raw)
To: b.a.t.m.a.n
Some files were not explicitly marked with any license. It is therefore
assumed that these are licensed under the GPL-2.0. Make this unambiguous by
adding this information direct to the file using the SPDX license
identifier. The FSFE REUSE *.license annotation file is used for files
which don't allow comments.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
v2:
- removed CHANGELOG.license README.external.license
---
.gitattributes | 3 +++
MAINTAINERS.license | 2 ++
2 files changed, 5 insertions(+)
create mode 100644 MAINTAINERS.license
diff --git a/.gitattributes b/.gitattributes
index 1d2a7e9..402ecae 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+# License-Filename: LICENSES/preferred/GPL-2.0
+
/.gitignore export-ignore
/.gitattributes export-ignore
*.c diff=cpp
diff --git a/MAINTAINERS.license b/MAINTAINERS.license
new file mode 100644
index 0000000..a55d70e
--- /dev/null
+++ b/MAINTAINERS.license
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: GPL-2.0
+License-Filename: LICENSES/preferred/GPL-2.0
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: Change batman_adv.h license to MIT
2017-11-19 14:05 [B.A.T.M.A.N.] [PATCH 0/9] batman-adv: License cleanup Sven Eckelmann
` (6 preceding siblings ...)
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 7/9] batman-adv: Mark remaining files as GPL-2.0 Sven Eckelmann
@ 2017-11-19 14:05 ` Sven Eckelmann
2017-11-20 2:01 ` Antonio Quartulli
` (3 more replies)
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 9/9] batman-adv: Import Linux's LICENSES/preferred/MIT Sven Eckelmann
2017-12-06 10:43 ` [B.A.T.M.A.N.] [PATCH 0/9] batman-adv: License cleanup Sven Eckelmann
9 siblings, 4 replies; 18+ messages in thread
From: Sven Eckelmann @ 2017-11-19 14:05 UTC (permalink / raw)
To: b.a.t.m.a.n
Cc: Sven Eckelmann, Simon Wunderlich, Matthias Schiffer,
Antonio Quartulli, Andrew Lunn
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@narfation.org>
---
I would ask for Acked-by from following persons
Cc: Simon Wunderlich <sw@simonwunderlich.de>
Cc: Matthias Schiffer <mschiffer@universe-factory.net>
Cc: Antonio Quartulli <a@unstable.cc>
Cc: Andrew Lunn <andrew@lunn.ch>
Please check
* https://www.gnu.org/licenses/license-list.html
* https://en.wikipedia.org/w/index.php?title=ISC_license&oldid=791486092
* https://en.wikipedia.org/w/index.php?title=MIT_License&oldid=809249689
For more information about these licenses.
---
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 fb453382..ae00c99c 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
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: Change batman_adv.h license to MIT
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: Change batman_adv.h license to MIT Sven Eckelmann
@ 2017-11-20 2:01 ` Antonio Quartulli
2017-11-20 8:30 ` Matthias Schiffer
` (2 subsequent siblings)
3 siblings, 0 replies; 18+ messages in thread
From: Antonio Quartulli @ 2017-11-20 2:01 UTC (permalink / raw)
To: Sven Eckelmann, b.a.t.m.a.n
[-- Attachment #1.1: Type: text/plain, Size: 864 bytes --]
On 19/11/17 22:05, Sven Eckelmann wrote:
> 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@narfation.org>
> ---
> I would ask for Acked-by from following persons
>
> Cc: Simon Wunderlich <sw@simonwunderlich.de>
> Cc: Matthias Schiffer <mschiffer@universe-factory.net>
> Cc: Antonio Quartulli <a@unstable.cc>
> Cc: Andrew Lunn <andrew@lunn.ch>
Acked-by: Antonio Quartulli <a@unstable.cc>
--
Antonio Quartulli
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: Change batman_adv.h license to MIT
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: Change batman_adv.h license to MIT Sven Eckelmann
2017-11-20 2:01 ` Antonio Quartulli
@ 2017-11-20 8:30 ` Matthias Schiffer
2017-11-20 12:33 ` Simon Wunderlich
2017-11-23 14:36 ` Sven Eckelmann
3 siblings, 0 replies; 18+ messages in thread
From: Matthias Schiffer @ 2017-11-20 8:30 UTC (permalink / raw)
To: Sven Eckelmann, b.a.t.m.a.n
Cc: Simon Wunderlich, Antonio Quartulli, Andrew Lunn
[-- Attachment #1.1: Type: text/plain, Size: 3632 bytes --]
On 11/19/2017 03:05 PM, Sven Eckelmann wrote:
> 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@narfation.org>
> ---
> I would ask for Acked-by from following persons
>
> Cc: Simon Wunderlich <sw@simonwunderlich.de>
> Cc: Matthias Schiffer <mschiffer@universe-factory.net>
> Cc: Antonio Quartulli <a@unstable.cc>
> Cc: Andrew Lunn <andrew@lunn.ch>
>
Acked-by: Matthias Schiffer <mschiffer@universe-factory.net>
> Please check
>
> * https://www.gnu.org/licenses/license-list.html
> * https://en.wikipedia.org/w/index.php?title=ISC_license&oldid=791486092
> * https://en.wikipedia.org/w/index.php?title=MIT_License&oldid=809249689
>
> For more information about these licenses.
> ---
> 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 fb453382..ae00c99c 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_
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: Change batman_adv.h license to MIT
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: Change batman_adv.h license to MIT Sven Eckelmann
2017-11-20 2:01 ` Antonio Quartulli
2017-11-20 8:30 ` Matthias Schiffer
@ 2017-11-20 12:33 ` Simon Wunderlich
2017-11-23 14:36 ` Sven Eckelmann
3 siblings, 0 replies; 18+ messages in thread
From: Simon Wunderlich @ 2017-11-20 12:33 UTC (permalink / raw)
To: Sven Eckelmann
Cc: b.a.t.m.a.n, Matthias Schiffer, Antonio Quartulli, Andrew Lunn
[-- Attachment #1: Type: text/plain, Size: 604 bytes --]
On Sunday, November 19, 2017 3:05:16 PM CET Sven Eckelmann wrote:
> 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@narfation.org>
Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: Change batman_adv.h license to MIT
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: Change batman_adv.h license to MIT Sven Eckelmann
` (2 preceding siblings ...)
2017-11-20 12:33 ` Simon Wunderlich
@ 2017-11-23 14:36 ` Sven Eckelmann
2017-11-23 15:43 ` Andrew Lunn
3 siblings, 1 reply; 18+ messages in thread
From: Sven Eckelmann @ 2017-11-23 14:36 UTC (permalink / raw)
To: Andrew Lunn; +Cc: b.a.t.m.a.n
[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]
Hi Andrew,
On Sonntag, 19. November 2017 15:05:16 CET Sven Eckelmann wrote:
> 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@narfation.org>
> ---
> I would ask for Acked-by from following persons
What I wanted to say here: "I would like to get an Acked-by reply from
following persons" (thanks to Simon, Matthias and Antonio for the fast
response).
[...]
> Cc: Andrew Lunn <andrew@lunn.ch>
You've also worked on the netlink support (a lot) and you have at least one
change of batman_adv.h [1] which can clearly be traced back to you. I would
therefore be really nice when you either could also send an Acked-by or tell
us about your concerns.
Thanks,
Sven
[1] https://git.open-mesh.org/batman-adv.git/blobdiff/15315a94ad98af583d207daaaf3f0bcda6c4573d..3b7a636060205a97fac5469ab6ab701ee30eb52b:/include/uapi/linux/batman_adv.h
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: Change batman_adv.h license to MIT
2017-11-23 14:36 ` Sven Eckelmann
@ 2017-11-23 15:43 ` Andrew Lunn
2017-11-23 18:13 ` Sven Eckelmann
0 siblings, 1 reply; 18+ messages in thread
From: Andrew Lunn @ 2017-11-23 15:43 UTC (permalink / raw)
To: Sven Eckelmann; +Cc: b.a.t.m.a.n
On Thu, Nov 23, 2017 at 03:36:04PM +0100, Sven Eckelmann wrote:
> Hi Andrew,
>
> On Sonntag, 19. November 2017 15:05:16 CET Sven Eckelmann wrote:
> > 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@narfation.org>
> > ---
> > I would ask for Acked-by from following persons
>
> What I wanted to say here: "I would like to get an Acked-by reply from
> following persons" (thanks to Simon, Matthias and Antonio for the fast
> response).
Hi Sven
Sorry, was not paying close enough attentions to notice you wanted my
feedback.
I just looked at Linus's current master branch:
~/linux/include/uapi$ grep -hr SPDX * | sort | uniq -c
14 /* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
541 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
113 /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
1 /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) AND MIT) */
21 /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
17 /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
4 /* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */
3 /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR MIT) */
3 /* SPDX-License-Identifier: LGPL-2.0+ WITH Linux-syscall-note */
3 /* SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */
15 /* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
We are in the region of "Lies, damn lies, and statistics", but
everything with an SPDX tag has some form of GPL/LGPL. Now, adding
SPDX tags is a new activity, and adding the GPLs tags have been done
first, since they are easier to do. So it could be there are a lot of
UAPI header files which are not {L}GPL. Also, given this small sample,
it seems BSD is more popular over MIT.
I understand the reasons for ISC to MIT, so
Acked-by: Andrew Lunn <andrew@lunn.ch>
However, i wounder if GPL-2.0 WITH Linux-syscall-note OR one of the
BSD variants would be more consistent with the rest of the kernel?
Andrew
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: Change batman_adv.h license to MIT
2017-11-23 15:43 ` Andrew Lunn
@ 2017-11-23 18:13 ` Sven Eckelmann
0 siblings, 0 replies; 18+ messages in thread
From: Sven Eckelmann @ 2017-11-23 18:13 UTC (permalink / raw)
To: Andrew Lunn; +Cc: b.a.t.m.a.n
[-- Attachment #1: Type: text/plain, Size: 3982 bytes --]
On Donnerstag, 23. November 2017 16:43:29 CET Andrew Lunn wrote:
[...]
> I just looked at Linus's current master branch:
>
> ~/linux/include/uapi$ grep -hr SPDX * | sort | uniq -c
> 14 /* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
> 541 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> 113 /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
> 1 /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) AND MIT) */
> 21 /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
> 17 /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
> 4 /* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */
> 3 /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR MIT) */
> 3 /* SPDX-License-Identifier: LGPL-2.0+ WITH Linux-syscall-note */
> 3 /* SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */
> 15 /* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
>
> We are in the region of "Lies, damn lies, and statistics", but
> everything with an SPDX tag has some form of GPL/LGPL. Now, adding
> SPDX tags is a new activity, and adding the GPLs tags have been done
> first, since they are easier to do. So it could be there are a lot of
> UAPI header files which are not {L}GPL. Also, given this small sample,
> it seems BSD is more popular over MIT.
Problem here is how the most SPDX stuff was added (until now). Mostly things
got an SPDX tag which either didn't contain any license information or which
used a rather obscure way of informing the user about the license. If I search
for some (not perfect) markers of the ISC then I can find 471 files (including
the nl80211.h which was the original reason to chose the ISC). And I find 3154
for MIT and 2371 for BSD (no idea which version is more popular here). I
cannot be really sure about the results until the proper SPDX tags
were added.
$ git grep -l 'Permission to use, copy, modify, and/or '|wc -l
471
$ git grep -l 'Permission is hereby granted, free of charge'|wc -l
3154
$ git grep -l 'Redistributions of source code must'|wc -l
2371
> I understand the reasons for ISC to MIT, so
>
> Acked-by: Andrew Lunn <andrew@lunn.ch>
Thanks
> However, i wounder if GPL-2.0 WITH Linux-syscall-note OR one of the
> BSD variants would be more consistent with the rest of the kernel?
From a popularity contest perspective, the BSD licenses seem to lose (I
could be wrong here). But some of the BSD license variants are also under the
LICENSES/preferred/ folder in Thomas Gleixner's latest patchset (which was
prepared with Linus & Co. [1]). So technically, the BSD-2 would also work.
To the "GPL-2.0 WITH Linux-syscall-note" part - we have currently the problem
that this file usually doesn't exist in a packaged form on Linux systems
(yet).
Usually, people are just building the external kernel module when they want
the latest features and then build their software *not* against the headers of
the external module. And this means that people tend to integrate the file in
their software (even we do that) to be able to access it when compiling it.
And I would like to avoid that people are scared of using netlink (with
batman_adv.h) because they would have to package a GPL-2.0 (+some extra stuff)
licensed file.
It seemed to be the easiest/cleanest move to have the file under a permissive
license. Especially because this file only contains the IDs used when
communicating with batman-adv over netlink and some (brief) documentation.
That said, I personally don't know of any closed-source software which uses
the batman-adv netlink interface.
Kind regards,
Sven
[1] at least I've read more than once that a this or that decision cannot be
changed because Linus said so :)
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* [B.A.T.M.A.N.] [PATCH 9/9] batman-adv: Import Linux's LICENSES/preferred/MIT
2017-11-19 14:05 [B.A.T.M.A.N.] [PATCH 0/9] batman-adv: License cleanup Sven Eckelmann
` (7 preceding siblings ...)
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 8/9] batman-adv: Change batman_adv.h license to MIT Sven Eckelmann
@ 2017-11-19 14:05 ` Sven Eckelmann
2017-12-06 10:43 ` [B.A.T.M.A.N.] [PATCH 0/9] batman-adv: License cleanup Sven Eckelmann
9 siblings, 0 replies; 18+ messages in thread
From: Sven Eckelmann @ 2017-11-19 14:05 UTC (permalink / raw)
To: b.a.t.m.a.n
The MIT license is used by batman-adv.h. Copy the Linux license reference
file with SPDX header for completeness sake.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Only add this patch when the batman_adv.h license was also changed to MIT
license.
---
LICENSES/preferred/MIT | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 LICENSES/preferred/MIT
diff --git a/LICENSES/preferred/MIT b/LICENSES/preferred/MIT
new file mode 100644
index 00000000..f33a68ce
--- /dev/null
+++ b/LICENSES/preferred/MIT
@@ -0,0 +1,30 @@
+Valid-License-Identifier: MIT
+SPDX-URL: https://spdx.org/licenses/MIT.html
+Usage-Guide:
+ To use the MIT License put the following SPDX tag/value pair into a
+ comment according to the placement guidelines in the licensing rules
+ documentation:
+ SPDX-License-Identifier: MIT
+License-Text:
+
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+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 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.
--
2.11.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [B.A.T.M.A.N.] [PATCH 0/9] batman-adv: License cleanup
2017-11-19 14:05 [B.A.T.M.A.N.] [PATCH 0/9] batman-adv: License cleanup Sven Eckelmann
` (8 preceding siblings ...)
2017-11-19 14:05 ` [B.A.T.M.A.N.] [PATCH 9/9] batman-adv: Import Linux's LICENSES/preferred/MIT Sven Eckelmann
@ 2017-12-06 10:43 ` Sven Eckelmann
9 siblings, 0 replies; 18+ messages in thread
From: Sven Eckelmann @ 2017-12-06 10:43 UTC (permalink / raw)
To: b.a.t.m.a.n
[-- Attachment #1: Type: text/plain, Size: 788 bytes --]
On Sonntag, 19. November 2017 15:05:08 CET Sven Eckelmann wrote:
> Hi,
>
> the kernel community is currently trying to make the licensing status more
> clear in each file. This is mostly done by adding SPDX license identifiers
> and defining a set of rules how these license related information has to
> be stored.
>
> I've used this opportunity to go through all files (for example with FSFE's
> `reuse lint`) and to annotate the files according to the "Linux licensing
> rules" and FSFE's REUSE practices.
>
> There are two things which could be seen as controversial:
>
> * change of batman_adv.h to the Linux preferred license
> (I am waiting for Acks)
> * explicitly mark remaining files as licensed under the GPL-2.0
Applied in f795e77ba40d..8de104e049ea
Kind regards,
Sven
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread