diff options
| author | David S. Miller <[email protected]> | 2015-10-24 13:54:12 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2015-10-24 13:54:12 +0000 |
| commit | ba3e2084f268bdfed7627046e58a2218037e15af (patch) | |
| tree | 36b99da43ee72f81b31f0627dbfc69f50c97378f /net/tipc/link.c | |
| parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | net: sysctl: fix a kmemleak warning (diff) | |
| download | kernel-ba3e2084f268bdfed7627046e58a2218037e15af.tar.gz kernel-ba3e2084f268bdfed7627046e58a2218037e15af.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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 <[email protected]>
Diffstat (limited to 'net/tipc/link.c')
0 files changed, 0 insertions, 0 deletions