Skip to content

Commit d3a5fd3

Browse files
committed
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 ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 962c382 + 7a79d71 commit d3a5fd3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+495
-66
lines changed

include/uapi/linux/batadv_packet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* 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:
33
*
44
* Marek Lindner, Simon Wunderlich
55
*

include/uapi/linux/batman_adv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* 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:
33
*
44
* Matthias Schiffer
55
*

net/batman-adv/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
# Copyright (C) 2007-2018 B.A.T.M.A.N. contributors:
2+
# Copyright (C) 2007-2019 B.A.T.M.A.N. contributors:
33
#
44
# Marek Lindner, Simon Wunderlich
55
#

net/batman-adv/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
# Copyright (C) 2007-2018 B.A.T.M.A.N. contributors:
2+
# Copyright (C) 2007-2019 B.A.T.M.A.N. contributors:
33
#
44
# Marek Lindner, Simon Wunderlich
55
#

net/batman-adv/bat_algo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
2-
/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors:
33
*
44
* Marek Lindner, Simon Wunderlich
55
*

net/batman-adv/bat_algo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
2-
/* Copyright (C) 2011-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2011-2019 B.A.T.M.A.N. contributors:
33
*
44
* Marek Lindner, Linus Lüssing
55
*

net/batman-adv/bat_iv_ogm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
2-
/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors:
33
*
44
* Marek Lindner, Simon Wunderlich
55
*

net/batman-adv/bat_iv_ogm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
2-
/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors:
33
*
44
* Marek Lindner, Simon Wunderlich
55
*

net/batman-adv/bat_v.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
2-
/* Copyright (C) 2013-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2013-2019 B.A.T.M.A.N. contributors:
33
*
44
* Linus Lüssing, Marek Lindner
55
*

net/batman-adv/bat_v.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
2-
/* Copyright (C) 2011-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2011-2019 B.A.T.M.A.N. contributors:
33
*
44
* Marek Lindner, Linus Lüssing
55
*

net/batman-adv/bat_v_elp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
2-
/* Copyright (C) 2011-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2011-2019 B.A.T.M.A.N. contributors:
33
*
44
* Linus Lüssing, Marek Lindner
55
*

net/batman-adv/bat_v_elp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
2-
/* Copyright (C) 2013-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2013-2019 B.A.T.M.A.N. contributors:
33
*
44
* Linus Lüssing, Marek Lindner
55
*

net/batman-adv/bat_v_ogm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
2-
/* Copyright (C) 2013-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2013-2019 B.A.T.M.A.N. contributors:
33
*
44
* Antonio Quartulli
55
*

net/batman-adv/bat_v_ogm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
2-
/* Copyright (C) 2013-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2013-2019 B.A.T.M.A.N. contributors:
33
*
44
* Antonio Quartulli
55
*

net/batman-adv/bitarray.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
2-
/* Copyright (C) 2006-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2006-2019 B.A.T.M.A.N. contributors:
33
*
44
* Simon Wunderlich, Marek Lindner
55
*

net/batman-adv/bitarray.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
2-
/* Copyright (C) 2006-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2006-2019 B.A.T.M.A.N. contributors:
33
*
44
* Simon Wunderlich, Marek Lindner
55
*

net/batman-adv/bridge_loop_avoidance.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
2-
/* Copyright (C) 2011-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2011-2019 B.A.T.M.A.N. contributors:
33
*
44
* Simon Wunderlich
55
*

net/batman-adv/bridge_loop_avoidance.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
2-
/* Copyright (C) 2011-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2011-2019 B.A.T.M.A.N. contributors:
33
*
44
* Simon Wunderlich
55
*

net/batman-adv/debugfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
2-
/* Copyright (C) 2010-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2010-2019 B.A.T.M.A.N. contributors:
33
*
44
* Marek Lindner
55
*

net/batman-adv/debugfs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
2-
/* Copyright (C) 2010-2018 B.A.T.M.A.N. contributors:
2+
/* Copyright (C) 2010-2019 B.A.T.M.A.N. contributors:
33
*
44
* Marek Lindner
55
*

0 commit comments

Comments
 (0)