mirror of https://gitee.com/openkylin/linux.git
26440c835f
Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| xgbe-common.h | ||
| xgbe-dcb.c | ||
| xgbe-debugfs.c | ||
| xgbe-desc.c | ||
| xgbe-dev.c | ||
| xgbe-drv.c | ||
| xgbe-ethtool.c | ||
| xgbe-main.c | ||
| xgbe-mdio.c | ||
| xgbe-ptp.c | ||
| xgbe.h | ||