| 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> | ||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| switchdev.c | ||
| 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> | ||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| switchdev.c | ||