diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-26 14:31:08 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-26 14:31:08 -0500 |
| commit | 49b3eb772505dc42b61c2920ca777d55455a8ee4 (patch) | |
| tree | d0279114338f465c6055e4b2f3398eb5bb0c79c2 /include/uapi/linux/Kbuild | |
| parent | 27d807180ae0a9e50d90adf9b22573c21be904c2 (diff) | |
| parent | c33705188c493b7de3b8dc2956d67de91b444727 (diff) | |
Merge tag 'batadv-next-for-davem-20170126' 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
- ignore self-generated loop detect MAC addresses in translation table,
by Simon Wunderlich
- install uapi batman_adv.h header, by Sven Eckelmann
- bump copyright years, by Sven Eckelmann
- Remove an unused variable in translation table code, by Sven Eckelmann
- Handle NET_XMIT_CN like NET_XMIT_SUCCESS (revised according to Davids
suggestion), and a follow up code clean up, by Gao Feng (2 patches)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/Kbuild')
| -rw-r--r-- | include/uapi/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 80ad741a42fa..486e050e64c5 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -64,6 +64,7 @@ header-y += auto_fs.h header-y += auxvec.h header-y += ax25.h header-y += b1lli.h +header-y += batman_adv.h header-y += baycom.h header-y += bcm933xx_hcs.h header-y += bfs_fs.h |