mirror of
https://github.com/torvalds/linux.git
synced 2026-02-04 15:12:32 +08:00
Mostly simple overlapping changes. For example, David Ahern's adjacency list revamp in 'net-next' conflicted with an adjacency list traversal bug fix in 'net'. Signed-off-by: David S. Miller <davem@davemloft.net>