From: David S. Miller <davem@davemloft.net>
Date: Mon, 30 Jan 2017 00:21:26 +0000 (-0500)
Subject: Merge tag 'batadv-next-for-davem-20170128' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v4.14-rc1~1463^2~288
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=936f459bea07868723b057ece43d321446c82f0a;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

936f459bea07868723b057ece43d321446c82f0a