mirror of
https://github.com/Evolution-X-Devices/kernel_google_b1c1
synced 2026-02-04 09:57:37 +00:00
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>