diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-10 01:28:45 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-10 01:28:45 +0200 |
| commit | 3118e6e19da7b8d76b2456b880c74a9aa3a2268b (patch) | |
| tree | 3060d11297c1195ef2d1f120d9c2247b4b1de4ae /arch/xtensa/mm/misc.S | |
| parent | net: ipv6: avoid overhead when no custom FIB rules are installed (diff) | |
| parent | futex: Remove unnecessary warning from get_futex_key (diff) | |
| download | linux-3118e6e19da7b8d76b2456b880c74a9aa3a2268b.tar.xz linux-3118e6e19da7b8d76b2456b880c74a9aa3a2268b.zip | |
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>
Diffstat (limited to 'arch/xtensa/mm/misc.S')
0 files changed, 0 insertions, 0 deletions