| commit | da07f52d3caf6c24c6dbffb5500f379d819e04bd | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri May 15 13:48:59 2020 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri May 15 13:48:59 2020 -0700 |
| tree | 836e51994554f1aeddeebb6cb6ee568944a467e7 | |
| parent | 93d43e58683efd958a0421b932a273df74e0e008 [diff] | |
| parent | f85c1598ddfe83f61d0656bd1d2025fa3b148b99 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net Move the bpf verifier trace check into the new switch statement in HEAD. Resolve the overlapping changes in hinic, where bug fixes overlap the addition of VF support. Signed-off-by: David S. Miller <davem@davemloft.net>