diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-01-15 23:04:04 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-15 23:04:04 +0100 |
| commit | 8fec380ac0d4e57aaf0d475482b840a1f3e3e0f3 (patch) | |
| tree | 335d1ccead6510f188bc638100486b3fa93b4463 /include | |
| parent | Merge branch 'bridge-add-vlan-notifications-and-rtm-support' (diff) | |
| parent | batman-adv: Disable CONFIG_BATMAN_ADV_SYSFS by default (diff) | |
| download | linux-dev-8fec380ac0d4e57aaf0d475482b840a1f3e3e0f3.tar.xz linux-dev-8fec380ac0d4e57aaf0d475482b840a1f3e3e0f3.zip | |
Merge tag 'batadv-next-for-davem-20200114' 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
- fix typo and kerneldocs, by Sven Eckelmann
- use WiFi txbitrate for B.A.T.M.A.N. V as fallback, by René Treffer
- silence some endian sparse warnings by adding annotations,
by Sven Eckelmann
- Update copyright years to 2020, by Sven Eckelmann
- Disable deprecated sysfs configuration by default, by Sven Eckelmann
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/batadv_packet.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/batman_adv.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/batadv_packet.h b/include/uapi/linux/batadv_packet.h index 2a15f01c2243..0ae34c85ef9e 100644 --- a/include/uapi/linux/batadv_packet.h +++ b/include/uapi/linux/batadv_packet.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */ -/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich */ diff --git a/include/uapi/linux/batman_adv.h b/include/uapi/linux/batman_adv.h index 67f4636758af..617c180ff0c8 100644 --- a/include/uapi/linux/batman_adv.h +++ b/include/uapi/linux/batman_adv.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: MIT */ -/* Copyright (C) 2016-2019 B.A.T.M.A.N. contributors: +/* Copyright (C) 2016-2020 B.A.T.M.A.N. contributors: * * Matthias Schiffer */ |