[patch F18/rawhide] team: update to latest net-next

[Josh Boyer]

On Thu, Oct 04, 2012 at 07:30:26AM +0200, Jiri Pirko wrote:
> Thu, Sep 27, 2012 at 03:44:19PM CEST, jwboyer at redhat.com wrote:
> >On Tue, Sep 25, 2012 at 12:22:22PM -0400, Josh Boyer wrote:
> >> On Mon, Sep 24, 2012 at 02:39:00PM +0200, Jiri Pirko wrote:
> >> > Mon, Sep 24, 2012 at 02:28:20PM CEST, jwboyer at redhat.com wrote:
> >> > >On Mon, Sep 24, 2012 at 08:02:54AM +0200, Jiri Pirko wrote:
> >> > >> Update team driver to latest net-next.
> >> > >> 
> >> > >> Split patches available here:
> >> > >> http://people.redhat.com/jpirko/f18_team_update_3/
> >> > >> 
> >> > >> Jiri Pirko (5):
> >> > >>   team: add support for non-ethernet devices
> >> > >>   team: don't print warn message on -ESRCH during event send
> >> > >>   vlan: add helper which can be called to see if device is used by vlan
> >> > >>   team: do not allow to add VLAN challenged port when vlan is used
> >> > >>   team: send port changed when added
> >> > >> 
> >> > >>  drivers/net/team/Kconfig                |   4 +-
> >> > >>  drivers/net/team/team.c                 | 137 ++++++++++++++++++++++++--------
> >> > >>  drivers/net/team/team_mode_broadcast.c  |   8 +-
> >> > >>  drivers/net/team/team_mode_roundrobin.c |   8 +-
> >> > >>  include/linux/if_team.h                 |   4 +-
> >> > >>  include/linux/if_vlan.h                 |   9 ++-
> >> > >>  net/8021q/vlan_core.c                   |   6 ++
> >> > >>  7 files changed, 128 insertions(+), 48 deletions(-)
> >> > >
> >> > >Does this replace the team-net-next-20120808.patch we're currently
> >> > >carrying or is it in addition to that?
> >> > 
> >> > It is an addition to that.
> >> > 
> >> > Thanks.
> >> 
> >> Applied to f18/master today.  Should be in the next rc7-git1 kernel
> >> build.
> >
> >This patch got a conflict with Linus' tree today because:
> >
> >commit 0b121fd28d071c766dddab743031ba6cfe9be68e
> >Author: Jiri Pirko <jiri at resnulli.us>
> >Date:   Sat Sep 22 07:07:53 2012 +0000
> >
> >    team: send port changed when added
> >
> >was pulled in already.  I've reworked the patch a bit.  It's below.
> >Could you review and let me know if it looks sane?
> 
> 
> Sorry for delay. I was on vacation.

No problem.

> Yes, this looks good. Thanks!

Great, thanks for the review.

josh