mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
Conflicts: net/bridge/br_mdb.c br_mdb.c conflict was a function call being removed to fix a bug in 'net' but whose signature was changed in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>