Merge tag 'batadv-next-for-davem-20190201' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says: ==================== This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Add DHCPACKs for DAT snooping, by Linus Luessing - Update copyright years for 2019, by Sven Eckelmann ====================

David S. Miller committed 7 years ago

Commit d3a5fd32 parents 962c382 7a79d7163 files · +495 −66Browse files

Showing the changes to include/uapi/linux (2 of 63 files). Show all

Unified · Split

2 files

include/uapi/linux/batadv_packet.h +1 −1
include/uapi/linux/batman_adv.h +1 −1

include/uapi/linux/batadv_packet.h+1−1

@@ -1,5 +1,5 @@
1	1	/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */
2		−/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors:
	2	+/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors:
3	3	*
4	4	* Marek Lindner, Simon Wunderlich
5	5	*

include/uapi/linux/batman_adv.h+1−1

@@ -1,5 +1,5 @@
1	1	/* SPDX-License-Identifier: MIT */
2		−/* Copyright (C) 2016-2018 B.A.T.M.A.N. contributors:
	2	+/* Copyright (C) 2016-2019 B.A.T.M.A.N. contributors:
3	3	*
4	4	* Matthias Schiffer
5	5	*