mirror of https://gitee.com/openkylin/linux.git
9f0d34bc34
Conflicts: drivers/net/usb/asix_common.c drivers/net/usb/sr9800.c drivers/net/usb/usbnet.c include/linux/usb/usbnet.h net/ipv4/tcp_ipv4.c net/ipv6/tcp_ipv6.c The TCP conflicts were overlapping changes. In 'net' we added a READ_ONCE() to the socket cached RX route read, whilst in 'net-next' Eric Dumazet touched the surrounding code dealing with how mini sockets are handled. With USB, it's a case of the same bug fix first going into net-next and then I cherry picked it back into net. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| fs_enet | ||
| Kconfig | ||
| Makefile | ||
| fec.h | ||
| fec_main.c | ||
| fec_mpc52xx.c | ||
| fec_mpc52xx.h | ||
| fec_mpc52xx_phy.c | ||
| fec_ptp.c | ||
| fsl_pq_mdio.c | ||
| gianfar.c | ||
| gianfar.h | ||
| gianfar_ethtool.c | ||
| gianfar_ptp.c | ||
| ucc_geth.c | ||
| ucc_geth.h | ||
| ucc_geth_ethtool.c | ||
| xgmac_mdio.c | ||