mirror of
https://github.com/Dasharo/linux.git
synced 2026-03-06 15:25:10 -08:00
The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack. Signed-off-by: David S. Miller <davem@davemloft.net>