On 05/14/2014 03:29 PM, David Miller wrote: > From: Vlad Yasevich <vyasevic@xxxxxxxxxx> > Date: Wed, 14 May 2014 11:09:20 -0400 > >> This series adds functionality to the bridge device to enable >> operations without setting all ports to promiscuous mode. > > I'm prepared to apply this, please address the minor stylistic > feedback you've received and resubmit. > > Also, what does: > > ==================== > Conflicts: > net/bridge/br_if.c > net/bridge/br_private.h > ==================== > > exactly mean in patch #7? > > Thanks. > Looks like left-overs after a few rebases... I'll remove. Will resubmit shortly with corrections. Thanks -vlad
