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
..
asm	xtensa: remove wrapper header for asm/param.h	2017-07-21 03:13:29 -07:00
uapi/asm	sock: add SOCK_ZEROCOPY sockopt	2017-08-03 21:37:29 -07:00