projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dcdecdc ee2c46f)
Merge branch 'hsr-next'
authorDavid S. Miller <davem@davemloft.net>
Tue, 16 Apr 2019 00:22:02 +0000 (17:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Apr 2019 00:22:02 +0000 (17:22 -0700)
commit432bc230700f86801cffa5e159e05dea6229f722
tree49b3133409c2ba5b9c02b5a9e451d8d8aa63ab12tree | snapshot
parentdcdecdcfe1fc39ded8590aed2fe84d62f14b2392commit | diff
parentee2c46f353901a41513ca0776d6bb6e6fd39cb98commit | 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>
John Crispins staging tree