projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>

Trivial merge
John Crispins staging tree