The following commit has been merged in the master branch: commit 8e57158683c5e23f74cb791cfbfe1c11acb43b42 Merge: badc6ac3212294bd37304c56ddf573c9ba3202e6 25d81f9307ffc166427d93152498f45178f5936a Author: Jakub Kicinski kuba@kernel.org Date: Mon Feb 8 11:32:40 2021 -0800

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: Jakub Kicinski kuba@kernel.org

diff --combined net/batman-adv/Kconfig index 43ae3dcbbbeb,dd853dc22d32..860a0786bc1e --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@@ -1,5 -1,5 +1,5 @@@ # 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

@@@ -9,6 -9,7 +9,6 @@@

config BATMAN_ADV tristate "B.A.T.M.A.N. Advanced Meshing Protocol" - depends on NET select LIBCRC32C help B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is