mirror of
https://github.com/torvalds/linux.git
synced 2026-05-16 18:46:14 +02: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> |
||
|---|---|---|
| .. | ||
| ena | ||
| Kconfig | ||
| Makefile | ||