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

Merge branch 'bonding-next'

Ding Tianhong says:

====================
bonding: support QinQ for bond arp interval

v1->v2: remvoe the comment "TODO: QinQ?".
	convert pr_xxx() to pr_xxx_ratelimited() for arp interval.

v2->v3: remove the unnecessary log for arp interval and add net ratelimit to
	avoid spam log.

v3->v4: Add ratelimit for debugging is not a good idea, it will miss some message
	if the user turns the debugging on, so don't add ratelimited on debugging.
====================

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

b620cb3e829f257f96845bd60813a94f598d6dec