mirror of
https://github.com/torvalds/linux
synced 2026-06-16 15:22:11 +09:00
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>