David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-06-15 11:59:32 -04:00

..

ila_common.c

kcm: Use stream parser

2016-08-17 19:36:23 -04:00

ila_lwt.c

net: add extack arg to lwtunnel build state

2017-05-30 11:55:32 -04:00

ila_xlat.c

ila_xlat: add missing hash secret initialization

2017-06-08 15:36:56 -04:00

ila.h

ila: Perform only one translation in forwarding path

2016-06-08 00:40:34 -07:00

Makefile

ila: Add generic ILA translation facility

2015-12-15 23:25:20 -05:00