From: David S. Miller <davem@davemloft.net>
Date: Wed, 26 Mar 2014 20:40:39 +0000 (-0400)
Subject: Merge branch 'bonding-next'
X-Git-Tag: v3.15-rc1~113^2~75
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5a6b99170c7042702112c64bec46bcca9fbcc6d7;p=linux.git

Merge branch 'bonding-next'

Ding Tianhong says:

====================
bonding: slight optimization and avoid spam for bond xmit path

v1->v2: Add ratelimit for debugging is not a good idea, it will miss some message
	if the user turns the debugging on, so remove the patch 3.
	use net_err_ratelimited instead of pr_err_ratelimited and use __func__ instead of
	bond_xmit_broadcast().
====================

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

5a6b99170c7042702112c64bec46bcca9fbcc6d7