mirror of https://gitee.com/openkylin/linux.git
a06ee256e5
Version bump conflict in batman-adv, take what's in net-next. iavf conflict, adjustment of netdev_ops in net-next conflicting with poll controller method removal in net. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| ixgb.h | ||
| ixgb_ee.c | ||
| ixgb_ee.h | ||
| ixgb_ethtool.c | ||
| ixgb_hw.c | ||
| ixgb_hw.h | ||
| ixgb_ids.h | ||
| ixgb_main.c | ||
| ixgb_osdep.h | ||
| ixgb_param.c | ||