projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 678550c 3e7514a)
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)
commit936f459bea07868723b057ece43d321446c82f0a
tree45b3174a471b105139d56fc7f6814f3b50bb4901tree | snapshot
parent678550c651aee051d66112933c87894f129b9355commit | diff
parent3e7514afc7d728dd47c5fe9d7a1f5216fe659cdacommit | 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>
Domain: System / Kernel;