David S. Miller
3118e6e19d
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.
The TCP conflict was a case of local variables in a function
being removed from both net and net-next.
In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-08-09 16:28:45 -07:00
2017-04-14 13:11:16 -07:00
2017-02-14 09:00:25 +00:00
2015-09-16 15:47:51 +02:00
2017-05-23 11:35:02 +02:00
2017-02-17 11:16:46 +00:00
2017-02-14 09:00:25 +00:00
2016-10-06 17:31:02 +02:00
2017-07-15 10:59:54 -07:00
2017-05-12 09:56:30 -07:00
2016-08-03 08:16:30 +02:00
2017-07-11 14:13:06 +02:00
2017-05-08 17:15:14 -07:00
2017-01-25 02:51:11 +01:00
2016-04-03 12:32:09 +02:00
2017-07-15 10:59:54 -07:00
2017-08-07 10:42:09 -07:00
2017-02-14 09:00:25 +00:00
2017-05-22 17:26:34 +02:00
2017-07-15 10:59:54 -07:00
2017-07-06 18:38:31 -07:00
2017-06-02 10:51:34 -07:00
2017-02-14 09:00:25 +00:00
2017-07-15 10:59:54 -07:00
2017-04-14 13:11:16 -07:00
2017-07-15 10:59:54 -07:00
2017-07-15 10:59:54 -07:00
2017-07-20 16:09:10 +02:00
2017-06-14 11:59:16 +02:00
2017-08-04 11:23:58 -07:00
2017-03-08 10:38:06 +01:00
2017-04-06 02:08:06 -04:00
2017-03-02 08:42:36 +01:00
2017-05-18 15:39:19 -05:00
2017-06-14 11:59:16 +02:00
2017-06-14 11:59:16 +02:00
2017-02-14 09:00:25 +00:00
2016-10-04 16:13:57 +02:00
2015-04-10 15:41:52 +02:00
2017-07-19 00:03:15 +02:00
2017-02-14 09:00:25 +00:00
2017-06-09 11:00:45 +02:00
2017-04-14 13:11:16 -07:00
2017-03-08 10:38:06 +01:00
2017-04-21 03:23:24 +02:00
2016-06-04 00:23:36 +02:00
2017-02-14 09:00:25 +00:00
2017-06-29 02:42:30 +02:00
2017-02-14 09:00:25 +00:00
2017-06-14 11:59:16 +02:00
2017-04-10 11:56:07 +02:00
2016-10-06 18:04:20 +02:00
2017-07-15 10:59:54 -07:00
2017-04-21 03:34:01 +02:00
2017-06-29 02:42:23 +02:00
2017-02-13 18:57:34 +00:00
3118e6e19d