mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
Conflicts: net/netfilter/nf_tables_core.c The nf_tables_core.c conflict was resolved using a conflict resolution from Stephen Rothwell as a guide. Signed-off-by: David S. Miller <davem@davemloft.net>