The following commit has been merged in the master branch: commit 936f459bea07868723b057ece43d321446c82f0a Merge: 678550c651aee051d66112933c87894f129b9355 3e7514afc7d728dd47c5fe9d7a1f5216fe659cda Author: David S. Miller davem@davemloft.net Date: Sun Jan 29 19:21:26 2017 -0500

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