| commit | 3ab0a7a0c349a1d7beb2bb371a62669d1528269d | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Sep 22 16:45:34 2020 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Tue Sep 22 16:45:34 2020 -0700 |
| tree | d2ae17c3bfc829ce0c747ad97021cd4bc8fb11dc | |
| parent | 92ec804f3dbf0d986f8e10850bfff14f316d7aaf [diff] | |
| parent | 805c6d3c19210c90c109107d189744e960eae025 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net Two minor conflicts: 1) net/ipv4/route.c, adding a new local variable while moving another local variable and removing it's initial assignment. 2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes. One pretty prints the port mode differently, whilst another changes the driver to try and obtain the port mode from the port node rather than the switch node. Signed-off-by: David S. Miller <davem@davemloft.net>