Merge tag 'v3.18.84' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable
[email protected] Thu, 21 Dec 2017 17:44:50 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994677AbdLUQowu5ahE/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Dec 21 14:26:27 2017 +0100 Commit: c3a9385169781642d01b01ef3bcaa6fa2a4a31be Gitweb: https://git.linux-mips.org/g/ralf/linux/c3a938516978 Branch: linux-3.18-stable --- Makefile | 2 +- drivers/char/ipmi/ipmi_msghandler.c | 10 ++++++---- drivers/net/ethernet/fealnx.c | 6 +++--- fs/coda/upcall.c | 3 +-- fs/ocfs2/file.c | 9 +++++++-- include/linux/skbuff.h | 7 +++++++ net/8021q/vlan.c | 6 +++--- net/core/skbuff.c | 1 + net/dccp/ipv6.c | 7 +++++++ net/ipv4/tcp_output.c | 9 ++------- net/ipv6/tcp_ipv6.c | 2 ++ net/netlink/af_netlink.c | 17 +++++++++++------ net/netlink/af_netlink.h | 1 + net/sctp/ipv6.c | 2 ++ net/sctp/socket.c | 4 ++++ security/integrity/ima/ima_appraise.c | 3 +++ 16 files changed, 61 insertions(+), 28 deletions(-)