diff options
| author | David S. Miller <[email protected]> | 2019-02-08 15:00:17 -0800 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2019-02-08 15:00:17 -0800 |
| commit | a655fe9f194842693258f43b5382855db1c2f654 (patch) | |
| tree | a6e523c42378f43881c421530941dcbb529461ab /tools/perf/scripts/python/powerpc-hcalls.py | |
| parent | 7499a288bf1a4a49be9d72beb0a5c7b9aa6ffec9 (diff) | |
| parent | 27b4ad621e887ce8e5eb508a0103f13d30f6b38a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
An ipvlan bug fix in 'net' conflicted with the abstraction away
of the IPV6 specific support in 'net-next'.
Similarly, a bug fix for mlx5 in 'net' conflicted with the flow
action conversion in 'net-next'.
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/powerpc-hcalls.py')
0 files changed, 0 insertions, 0 deletions