diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-04-15 17:22:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-15 17:22:02 -0700 |
| commit | 432bc230700f86801cffa5e159e05dea6229f722 (patch) | |
| tree | 49b3133409c2ba5b9c02b5a9e451d8d8aa63ab12 /tools/perf/scripts/python/exported-sql-viewer.py | |
| parent | net: phy: switch drivers to use dynamic feature detection (diff) | |
| parent | net: hsr: add tx stats for master interface (diff) | |
| download | wireguard-linux-432bc230700f86801cffa5e159e05dea6229f722.tar.xz wireguard-linux-432bc230700f86801cffa5e159e05dea6229f722.zip | |
Merge branch 'hsr-next'
Murali Karicheri says:
====================
net: hsr: updates from internal tree
This series picks commit from our internal kernel tree.
Patch 1/3 fixes a file name issue introduced in my previous
series.
History:
v2: fixed patch 3/3 by moving stats update to inside hsr_forward_skb()
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/scripts/python/exported-sql-viewer.py')
0 files changed, 0 insertions, 0 deletions