David S. Miller
ba3e2084f2
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 <davem@davemloft.net >
2015-10-24 06:54:12 -07:00
..
2015-09-29 10:56:05 +03:00
2015-10-09 07:49:01 -07:00
2015-09-17 20:14:27 +03:00
2015-09-10 16:42:49 -07:00
2015-10-14 19:14:44 -07:00
2015-10-14 19:14:43 -07:00
2015-10-09 07:49:00 -07:00
2015-09-18 21:57:43 +02:00
2015-09-18 21:57:35 +02:00
2015-09-18 21:57:43 +02:00
2015-09-18 21:57:43 +02:00
2015-10-21 19:50:44 -07:00
2015-09-16 20:44:47 +01:00
2015-09-17 18:01:28 -04:00
2015-10-20 06:08:27 -07:00
2015-09-26 01:53:07 +02:00
2015-09-24 16:48:52 -04:00
2015-10-01 10:10:57 +02:00
2015-09-29 11:32:45 -06:00
2015-10-12 19:13:36 -07:00
2015-10-08 04:45:52 -07:00
2015-09-10 18:56:14 -07:00
2015-09-16 11:51:12 -04:00
2015-09-14 11:00:55 +02:00
2015-10-23 02:49:35 -07:00
2015-09-16 02:17:49 +02:00
2015-10-09 07:49:02 -07:00
2015-09-11 14:23:29 +09:00
2015-10-11 04:40:05 -07:00
2015-10-09 07:48:59 -07:00
2015-10-13 10:34:46 +02:00
2015-09-24 20:42:37 +02:00
2015-09-23 14:35:58 -07:00
2015-10-23 05:44:28 -07:00
2015-09-29 16:27:47 -07:00
2015-10-09 07:49:05 -07:00
2015-09-16 11:51:12 -04:00
2015-10-05 02:45:25 -07:00
2015-09-16 15:47:51 +02:00
2015-09-16 15:47:51 +02:00
2015-10-09 17:17:30 +02:00
2015-09-16 15:47:51 +02:00
2015-09-15 07:12:06 +02:00
2015-09-10 13:29:01 -07:00
2015-09-10 13:29:01 -07:00
2015-10-01 21:42:35 -04:00
2015-10-01 21:42:35 -04:00
2015-09-10 13:29:01 -07:00
2015-10-08 05:26:35 -07:00
2015-10-24 06:54:12 -07:00
2015-09-17 17:18:37 -07:00
2015-09-17 17:18:32 -07:00
2015-09-29 20:21:32 +02:00
2015-09-30 01:45:03 -05:00
2015-10-16 18:45:36 +02:00
2015-10-08 05:26:36 -07:00
2015-10-23 02:49:35 -07:00
2015-09-10 13:29:01 -07:00
2015-09-10 13:29:01 -07:00
2015-09-10 13:29:01 -07:00
2015-10-23 05:57:43 -07:00
2015-09-10 13:29:01 -07:00
2015-09-10 13:29:01 -07:00
2015-10-08 05:26:38 -07:00
2015-09-20 20:50:06 -07:00
2015-10-06 16:12:34 +01:00
2015-10-09 07:49:06 -07:00
2015-10-12 19:13:36 -07:00
2015-09-20 17:00:26 -07:00
2015-09-11 15:21:34 -07:00
2015-10-21 07:00:46 -07:00
2015-09-10 13:29:01 -07:00
2015-09-11 15:21:34 -07:00
2015-10-22 06:22:13 -07:00
2015-09-14 07:39:46 -07:00
2015-09-22 15:09:53 -07:00
2015-09-10 13:29:01 -07:00