Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3a5fd3c authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 962c382d 7a79d717

include/uapi/linux/batadv_packet.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */

/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:

/* Copyright (C) 2007-2019  B.A.T.M.A.N. contributors:

 *

 * Marek Lindner, Simon Wunderlich

 *

include/uapi/linux/batman_adv.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/* Copyright (C) 2016-2018  B.A.T.M.A.N. contributors:

/* Copyright (C) 2016-2019  B.A.T.M.A.N. contributors:

 *

 * Matthias Schiffer

 *

net/batman-adv/Kconfig

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:

# Copyright (C) 2007-2019  B.A.T.M.A.N. contributors:

#

# Marek Lindner, Simon Wunderlich

#

net/batman-adv/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:

# Copyright (C) 2007-2019  B.A.T.M.A.N. contributors:

#

# Marek Lindner, Simon Wunderlich

#

net/batman-adv/bat_algo.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:

/* Copyright (C) 2007-2019  B.A.T.M.A.N. contributors:

 *

 * Marek Lindner, Simon Wunderlich

 *