]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'batadv-net-for-davem-20161119' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sat, 19 Nov 2016 16:11:52 +0000 (11:11 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sat, 19 Nov 2016 16:11:52 +0000 (11:11 -0500)
commit3a46c1211293767ca9c7dca8f57ee804e7b7daed
treea9c4722291c9af0cb3e1a58474fdc6f37cc5554f
parent6ee0a4e7f51c9f2b7e0325c4bcd73384662d663c
parent6d402102a21317fc42fe29181d9e9bd2e5d29609
Merge tag 'batadv-net-for-davem-20161119' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
Here are two batman-adv bugfix patches:

 - Revert a splat on disabling interface which created another problem,
   by Sven Eckelmann

 - Fix error handling when the primary interface disappears during a
   throughput meter test, by Sven Eckelmann
====================

Signed-off-by: David S. Miller <davem@davemloft.net>