| commit | 3118e6e19da7b8d76b2456b880c74a9aa3a2268b | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Aug 09 16:28:45 2017 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Wed Aug 09 16:28:45 2017 -0700 |
| tree | 3060d11297c1195ef2d1f120d9c2247b4b1de4ae | |
| parent | feca7d8c135bc1527b244fe817b8b6498066ccec [diff] | |
| parent | 48fb6f4db940e92cfb16cd878cddd59ea6120d06 [diff] |
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>