Commits
![David S. Miller](https://secure.gravatar.com/avatar/81279c43ce60f56aea992763d1ed612b.jpg?s=96&d=mm)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 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>