From: David S. Miller <davem@davemloft.net>
Date: Tue, 23 Jul 2013 23:53:03 +0000 (-0700)
Subject: Merge branch 'team' ("add support for peer notifications and igmp rejoins for team")
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=45c9149024dd082f1ac51fe46b0622f7c923f77f;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'team' ("add support for peer notifications and igmp rejoins for team")

Jiri Pirko says:

====================
The middle patch adjusts core infrastructure so the bonding code can be
generalized and reused by team.

v1->v2: using msecs_to_jiffies() as suggested by Eric

Jiri Pirko (3):
  team: add peer notification
  net: convert resend IGMP to notifier event
  team: add support for sending multicast rejoins
====================

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

45c9149024dd082f1ac51fe46b0622f7c923f77f