Merge tag 'v3.18.118' 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:42 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994601AbeHaBXooL9tV/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Aug 31 02:36:51 2018 +0200 Commit: c59c1d51a3cd7e9ab6ec03f1f09973894b092652 Gitweb: https://git.linux-mips.org/g/ralf/linux/c59c1d51a3cd Branch: linux-3.18-stable --- Makefile | 2 - arch/microblaze/boot/Makefile | 10 +++- arch/powerpc/kernel/head_8xx.S | 2 - arch/powerpc/kernel/pci_32.c | 1 arch/powerpc/platforms/chrp/time.c | 6 ++- arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 5 ++ arch/powerpc/platforms/powermac/bootx_init.c | 4 +- arch/powerpc/platforms/powermac/setup.c | 1 arch/s390/include/asm/cpu_mf.h | 6 ++- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 2 - .../x86/kernel/cpu/perf_event_intel_uncore_nhmex.c | 2 - crypto/authenc.c | 1 crypto/authencesn.c | 1 drivers/acpi/pci_root.c | 4 +- drivers/ata/libata-eh.c | 12 +++-- drivers/char/random.c | 10 ++++ drivers/crypto/padlock-aes.c | 8 +++ drivers/gpu/drm/gma500/psb_intel_drv.h | 2 - drivers/gpu/drm/gma500/psb_intel_lvds.c | 2 - drivers/gpu/drm/radeon/radeon_connectors.c | 10 ++-- drivers/hid/i2c-hid/i2c-hid.c | 8 +++ drivers/infiniband/core/mad.c | 11 +++-- drivers/infiniband/core/ucma.c | 6 ++- drivers/md/md.c | 3 + drivers/media/common/siano/smsendian.c | 14 +++--- drivers/media/i2c/smiapp/smiapp-core.c | 11 ++--- drivers/media/pci/saa7164/saa7164-fw.c | 3 + drivers/media/platform/omap3isp/isp.c | 7 ++- drivers/media/radio/si470x/radio-si470x-i2c.c | 6 +-- drivers/net/can/usb/ems_usb.c | 1 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 - drivers/net/wireless/ath/regd.h | 5 ++ drivers/net/wireless/ath/regd_common.h | 13 +++++ drivers/net/wireless/mwifiex/usb.c | 3 + drivers/net/wireless/rsi/rsi_91x_sdio.c | 2 - drivers/net/wireless/ti/wlcore/sdio.c | 5 ++ drivers/net/xen-netfront.c | 6 +++ drivers/pci/pci-sysfs.c | 15 ++++-- drivers/regulator/pfuze100-regulator.c | 1 drivers/rtc/interface.c | 5 ++ drivers/scsi/3w-9xxx.c | 5 ++ drivers/scsi/3w-xxxx.c | 3 + drivers/scsi/megaraid.c | 3 + drivers/scsi/qla2xxx/qla_init.c | 7 +-- drivers/scsi/qla2xxx/qla_os.c | 5 +- drivers/scsi/sg.c | 1 drivers/scsi/ufs/ufshcd.c | 2 + drivers/tty/hvc/hvc_opal.c | 1 drivers/tty/pty.c | 3 + drivers/usb/core/hub.c | 4 ++ drivers/virtio/virtio_balloon.c | 2 + fs/jfs/xattr.c | 10 +++- fs/squashfs/block.c | 2 + fs/squashfs/cache.c | 3 + fs/squashfs/file.c | 8 +++ fs/squashfs/fragment.c | 17 ++++--- fs/squashfs/squashfs_fs.h | 6 +++ fs/squashfs/squashfs_fs_sb.h | 1 fs/squashfs/super.c | 5 +- include/linux/ring_buffer.h | 1 include/net/tcp.h | 2 - kernel/bpf/verifier.c | 4 +- kernel/trace/ring_buffer.c | 16 +++++++ kernel/trace/trace.c | 6 +++ kernel/trace/trace_events_trigger.c | 18 +++++--- kernel/trace/trace_kprobe.c | 15 +++++- mm/slub.c | 2 - mm/vmalloc.c | 3 + net/dsa/slave.c | 6 +++ net/ipv4/fib_frontend.c | 4 +- net/ipv4/inet_fragment.c | 10 ++-- net/ipv4/ipconfig.c | 13 +++++ net/ipv4/tcp_dctcp.c | 4 +- net/ipv4/tcp_input.c | 48 ++++++++++---------- sound/pci/emu10k1/emupcm.c | 4 +- sound/pci/emu10k1/memory.c | 6 +-- sound/pci/fm801.c | 16 +++++-- sound/pci/hda/patch_ca0132.c | 8 +++ sound/soc/soc-pcm.c | 6 ++- sound/usb/pcm.c | 2 - tools/usb/usbip/src/usbip_detach.c | 9 +++- 81 files changed, 365 insertions(+), 144 deletions(-)