mirror of https://gitee.com/openkylin/linux.git
70f3522614
Three conflicts, one of which, for marvell10g.c is non-trivial and requires some follow-up from Heiner or someone else. The issue is that Heiner converted the marvell10g driver over to use the generic c45 code as much as possible. However, in 'net' a bug fix appeared which makes sure that a new local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0 is cleared. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| ipvlan.h | ||
| ipvlan_core.c | ||
| ipvlan_l3s.c | ||
| ipvlan_main.c | ||
| ipvtap.c | ||