ba3e2084f2
Conflicts: net/ipv6/xfrm6_output.c net/openvswitch/flow_netlink.c net/openvswitch/vport-gre.c net/openvswitch/vport-vxlan.c net/openvswitch/vport.c net/openvswitch/vport.h The openvswitch conflicts were overlapping changes. One was the egress tunnel info fix in 'net' and the other was the vport ->send() op simplification in 'net-next'. The xfrm6_output.c conflicts was also a simplification overlapping a bug fix. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| act2000 | ||
| capi | ||
| divert | ||
| gigaset | ||
| hardware | ||
| hisax | ||
| hysdn | ||
| i4l | ||
| icn | ||
| isdnloop | ||
| mISDN | ||
| pcbit | ||
| sc | ||
| Kconfig | ||
| Makefile | ||