Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>
Linux DECnet Project ====================== The documentation for this kernel subsystem is available in the Documentation/networking subdirectory of this distribution and also on line at http://www.chygwyn.com/DECnet/ Steve Whitehouse <SteveW@ACM.org>