Merge tag 'v3.18.117' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable
[email protected] Fri, 31 Aug 2018 03:23:36 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994589AbeHaBXiDMtXr/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Aug 31 02:36:33 2018 +0200 Commit: 95832cac885546501713a08ce8243390562ad4f4 Gitweb: https://git.linux-mips.org/g/ralf/linux/95832cac8855 Branch: linux-3.18-stable --- Makefile | 3 - arch/arc/include/asm/page.h | 2 arch/arc/include/asm/pgtable.h | 2 arch/arm/include/asm/uaccess.h | 2 arch/x86/kernel/cpu/mcheck/mce.c | 3 - drivers/net/can/xilinx_can.c | 98 +++++++++++++++----- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 2 drivers/ptp/ptp_chardev.c | 1 drivers/usb/class/cdc-acm.c | 3 + drivers/usb/core/hub.c | 8 +- drivers/usb/gadget/function/f_fs.c | 2 fs/fat/inode.c | 20 +++- include/linux/skbuff.h | 12 +- include/net/tcp.h | 2 net/core/rtnetlink.c | 9 +- net/core/skbuff.c | 1 net/ipv4/ip_output.c | 2 net/ipv4/sysctl_net_ipv4.c | 5 + net/ipv4/tcp_dctcp.c | 50 +++------- net/ipv4/tcp_input.c | 22 ++++ net/ipv4/tcp_output.c | 33 +++++-- net/ipv6/ip6_output.c | 2 sound/core/rawmidi.c | 20 +++- 23 files changed, 198 insertions(+), 106 deletions(-)