Merge tag 'v3.18.65' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994815AbdIVISlNeIRV/[email protected]> |
Author: Ralf Baechle <[email protected]> Wed Sep 20 23:38:05 2017 +0200 Commit: 3fdfafd3f3c84729b86bca461a41393f28ed8b38 Gitweb: https://git.linux-mips.org/g/ralf/linux/3fdfafd3f3c8 Branch: linux-3.18-stable --- Makefile | 2 +- net/core/dev.c | 2 +- net/ipv4/ip_output.c | 7 +++++-- net/ipv4/tcp_input.c | 4 ++-- net/ipv4/tcp_output.c | 3 +++ net/ipv4/tcp_timer.c | 3 ++- net/ipv4/udp.c | 2 +- net/ipv4/udp_offload.c | 2 +- net/ipv6/ip6_output.c | 7 ++++--- net/ipv6/udp_offload.c | 2 +- net/packet/af_packet.c | 13 +++++++++---- net/sched/act_ipt.c | 2 +- 12 files changed, 31 insertions(+), 18 deletions(-)