mirror of https://gitee.com/openkylin/linux.git
71a83a6db6
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> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| netxen_nic.h | ||
| netxen_nic_ctx.c | ||
| netxen_nic_ethtool.c | ||
| netxen_nic_hdr.h | ||
| netxen_nic_hw.c | ||
| netxen_nic_hw.h | ||
| netxen_nic_init.c | ||
| netxen_nic_main.c | ||