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-12 22:02:40 +02:00
2017-08-01 15:26:19 -07:00
2017-07-18 11:13:41 -07:00
2017-08-01 15:26:19 -07:00
2017-07-21 16:26:01 -07:00
2017-08-03 09:13:51 -07:00
2017-06-15 12:12:40 -04:00
2017-06-15 12:12:40 -04:00