Merge tag 'v3.18.93' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable
[email protected] Fri, 02 Feb 2018 13:20:26 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23991359AbeBBMU2uSC6P/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Feb 2 13:06:07 2018 +0100 Commit: e7dacf8a2648bf79e7b33578b34e430657c70196 Gitweb: https://git.linux-mips.org/g/ralf/linux/e7dacf8a2648 Branch: linux-3.18-stable --- Makefile | 2 +- arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 10 +++++++-- arch/arm64/kvm/handle_exit.c | 4 ++- arch/mips/ar7/platform.c | 2 +- arch/x86/include/asm/processor.h | 2 +- arch/x86/kernel/cpu/microcode/intel.c | 20 ++++++++++++++++- drivers/input/misc/twl4030-vibra.c | 7 ++++-- drivers/input/misc/twl6040-vibra.c | 2 +- drivers/input/touchscreen/88pm860x-ts.c | 16 ++++++++++---- drivers/md/dm-thin-metadata.c | 6 ++++- drivers/md/persistent-data/dm-btree.c | 19 ++-------------- drivers/net/ppp/pppoe.c | 11 +++++----- drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- drivers/phy/phy-core.c | 4 +++ drivers/scsi/libiscsi.c | 2 +- drivers/scsi/sg.c | 30 ++++++++------------------ fs/fcntl.c | 4 +++ fs/pipe.c | 18 ++++++++++++++-- fs/reiserfs/bitmap.c | 14 ++++++++++-- include/linux/tcp.h | 7 +++++- include/net/arp.h | 3 +++ include/net/net_namespace.h | 10 +++++++++ include/scsi/sg.h | 1 - include/uapi/linux/eventpoll.h | 13 +++++++++++ ipc/msg.c | 5 +++- kernel/futex.c | 3 +++ kernel/gcov/Kconfig | 1 + kernel/time/hrtimer.c | 2 ++ mm/memcontrol.c | 2 +- mm/memory-failure.c | 7 ++++++ mm/mmap.c | 6 +++-- net/can/af_can.c | 22 +++++++++---------- net/core/dev.c | 19 +++++++++++++--- net/core/neighbour.c | 4 ++- net/dccp/ccids/ccid2.c | 3 +++ net/ipv4/arp.c | 7 +++++- net/ipv4/igmp.c | 2 +- net/ipv4/tcp.c | 3 +++ net/ipv4/tcp_timer.c | 15 +++++++++++++ net/ipv6/ip6_output.c | 6 +++-- net/key/af_key.c | 8 +++++++ net/netfilter/nf_conntrack_core.c | 7 ++++++ net/netfilter/nf_conntrack_expect.c | 2 +- net/netfilter/nf_conntrack_sip.c | 5 +++- net/netfilter/nfnetlink_cthelper.c | 10 +++++++++ net/netfilter/xt_osf.c | 7 ++++++ net/sctp/socket.c | 30 ++++++++++---------------- sound/core/pcm_lib.c | 1 - sound/pci/hda/patch_cirrus.c | 1 + tools/usb/usbip/src/usbip.c | 2 ++ 50 files changed, 273 insertions(+), 116 deletions(-)