| commit | 432bc230700f86801cffa5e159e05dea6229f722 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Apr 15 17:22:02 2019 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Apr 15 17:22:02 2019 -0700 |
| tree | 49b3133409c2ba5b9c02b5a9e451d8d8aa63ab12 | |
| 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>