]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 22fb97f 87259d0)
Merge tag 'batadv-next-for-davem-20170128' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 30 Jan 2017 00:21:26 +0000 (19:21 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 30 Jan 2017 00:21:26 +0000 (19:21 -0500)
commit5d203a6ffcd6b88826a16fabc9a6c755a81be078
tree45b3174a471b105139d56fc7f6814f3b50bb4901tree | snapshot
parent22fb97f0fb0bd59d9bf52249d32553f3139421b1commit | diff
parent87259d0f1b70f8726c721259a90fd765fc9caf37commit | diff
Merge tag 'batadv-next-for-davem-20170128' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
Here are two fixes for batman-adv for net-next:

 - fix double call of dev_queue_xmit(), caused by the recent introduction
   of net_xmit_eval(), by Sven Eckelmann

 - Fix includes for IS_ERR/ERR_PTR, by Sven Eckelmann
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Linux Kernel Source Tree.