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