| commit | 4d8773b68e83558025303f266070b31bc4101e73 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Jan 26 10:40:21 2020 +0100 |
| committer | David S. Miller <davem@davemloft.net> | Sun Jan 26 10:40:21 2020 +0100 |
| tree | 151cafa469fbc6a411d36b58ab802f67869cc0bb | |
| parent | 3333e50b64fe30b7e53cf02456a2f567f689ae4f [diff] | |
| parent | 2821e26f3a0a3872184581caac8115bb02641941 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net Minor conflict in mlx5 because changes happened to code that has moved meanwhile. Signed-off-by: David S. Miller <davem@davemloft.net>