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 /drivers/net/xen-netfront.c | |
| parent | dcdecdcfe1fc39ded8590aed2fe84d62f14b2392 (diff) | |
| parent | ee2c46f353901a41513ca0776d6bb6e6fd39cb98 (diff) | |
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 'drivers/net/xen-netfront.c')
0 files changed, 0 insertions, 0 deletions