mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-02-18 19:01:44 +00:00
![David S. Miller](/assets/img/avatar_default.png)
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>