mirror of
https://github.com/Dasharo/linux.git
synced 2026-03-06 15:25:10 -08: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>