mirror of https://gitee.com/openkylin/linux.git
143c905494
Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
af_unix.c | ||
diag.c | ||
garbage.c | ||
sysctl_net_unix.c |