mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 16:41:58 +00:00
3118e6e19d
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> |
||
|---|---|---|
| .. | ||
| fault-injection | ||
| ktest | ||
| nvdimm | ||
| radix-tree | ||
| selftests | ||