mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 21:24:00 +08:00
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 | ||
fec_main.c | ||
fec_mpc52xx_phy.c | ||
fec_mpc52xx.c | ||
fec_mpc52xx.h | ||
fec_ptp.c | ||
fec.h | ||
fsl_pq_mdio.c | ||
gianfar_ethtool.c | ||
gianfar_ptp.c | ||
gianfar.c | ||
gianfar.h | ||
Kconfig | ||
Makefile | ||
ucc_geth_ethtool.c | ||
ucc_geth.c | ||
ucc_geth.h | ||
xgmac_mdio.c |