Commit 8e571586 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'batadv-next-pullrequest-20210208' of git://git.open-mesh.org/linux-merge 

Simon Wunderlich says:

====================
This feature/cleanup patchset is an updated version of the pull request
of Feb 2nd (batadv-next-pullrequest-20210202) and includes the
following patches:

 - Bump version strings, by Simon Wunderlich (added commit log)

 - Drop publication years from copyright info, by Sven Eckelmann
   (replaced the previous patch which updated copyright years, as per
    our discussion)

 - Avoid sizeof on flexible structure, by Sven Eckelmann (unchanged)

 - Fix names for kernel-doc blocks, by Sven Eckelmann (unchanged)

* tag 'batadv-next-pullrequest-20210208' of git://git.open-mesh.org/linux-merge:
  batman-adv: Fix names for kernel-doc blocks
  batman-adv: Avoid sizeof on flexible structure
  batman-adv: Drop publication years from copyright info
  batman-adv: Start new development cycle
====================

Link: https://lore.kernel.org/r/20210208165938.13262-1-sw@simonwunderlich.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents badc6ac3 25d81f93

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-2020  B.A.T.M.A.N. contributors:

/* Copyright (C) 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-2020  B.A.T.M.A.N. contributors:

/* Copyright (C) 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-2020  B.A.T.M.A.N. contributors:

# Copyright (C) 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-2020  B.A.T.M.A.N. contributors:

# Copyright (C) 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-2020  B.A.T.M.A.N. contributors:

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

 *

 * Marek Lindner, Simon Wunderlich

 */