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