Merge tag 'v3.18.114' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable
[email protected] Wed, 04 Jul 2018 16:50:38 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994653AbeGDOulCvSsA/[email protected]> |
Author: Ralf Baechle <[email protected]> Wed Jul 4 16:03:11 2018 +0200 Commit: d8f554cc393434cddacef06f2003f979b9e3b028 Gitweb: https://git.linux-mips.org/g/ralf/linux/d8f554cc3934 Branch: linux-3.18-stable --- Makefile | 7 +-- arch/arm/boot/compressed/head.S | 16 ++++--- arch/arm/include/asm/kgdb.h | 2 - arch/arm/mach-davinci/board-dm355-evm.c | 6 +++ arch/arm/mach-davinci/board-dm646x-evm.c | 3 + arch/arm/mach-keystone/pm_domain.c | 1 arch/arm64/kernel/ptrace.c | 6 --- arch/hexagon/include/asm/io.h | 6 +++ arch/hexagon/lib/checksum.c | 1 arch/m68k/mm/kmap.c | 3 + arch/mips/bcm47xx/setup.c | 6 +++ arch/mips/include/asm/io.h | 4 ++ arch/mips/include/asm/mipsregs.h | 3 + arch/mips/kernel/mcount.S | 27 +++++------- arch/parisc/kernel/time.c | 2 - arch/powerpc/kernel/entry_64.S | 1 arch/powerpc/kernel/fadump.c | 3 + arch/powerpc/kernel/hw_breakpoint.c | 4 +- arch/powerpc/kernel/ptrace.c | 1 arch/x86/kernel/cpu/intel.c | 3 + arch/xtensa/kernel/traps.c | 2 - drivers/ata/libata-core.c | 3 - drivers/ata/libata-eh.c | 4 +- drivers/ata/libata-zpodd.c | 4 +- drivers/char/agp/uninorth-agp.c | 4 +- drivers/char/ipmi/ipmi_bt_sm.c | 3 + drivers/gpu/drm/msm/msm_gem.c | 20 +++++---- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 ++- drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-viperboard.c | 2 - drivers/md/dm-thin.c | 11 ++++- drivers/media/dvb-core/dvb_frontend.c | 23 +++++++--- drivers/media/usb/cx231xx/cx231xx-cards.c | 3 + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 - drivers/mtd/chips/cfi_cmdset_0002.c | 21 +++++---- drivers/net/can/dev.c | 2 - drivers/net/phy/marvell.c | 9 ++++ drivers/pci/hotplug/pciehp.h | 2 - drivers/pci/hotplug/pciehp_core.c | 2 - drivers/pci/hotplug/pciehp_hpc.c | 13 +++++- drivers/s390/net/smsgiucv.c | 2 - drivers/scsi/isci/port_config.c | 3 - drivers/scsi/qla2xxx/qla_init.c | 3 + drivers/scsi/scsi_transport_iscsi.c | 29 ++++++++----- drivers/scsi/vmw_pvscsi.c | 2 - drivers/usb/core/hub.c | 4 +- drivers/usb/musb/musb_host.c | 5 ++ drivers/usb/musb/musb_host.h | 7 ++- drivers/usb/musb/musb_virthub.c | 25 +++++++---- drivers/video/backlight/as3711_bl.c | 33 ++++++++++----- drivers/video/backlight/max8925_bl.c | 4 +- drivers/video/backlight/tps65217_bl.c | 4 +- drivers/video/fbdev/uvesafb.c | 3 + drivers/w1/masters/mxc_w1.c | 20 ++++++--- drivers/xen/events/events_base.c | 2 - fs/binfmt_misc.c | 12 ++++- fs/btrfs/scrub.c | 2 - fs/ext4/inode.c | 36 ++++++++-------- fs/ext4/resize.c | 2 - fs/fuse/dir.c | 13 +++++- fs/fuse/inode.c | 1 fs/isofs/inode.c | 3 + fs/nfsd/nfs4xdr.c | 5 +- fs/notify/fsnotify.c | 25 +++++------ fs/ubifs/journal.c | 2 - fs/udf/directory.c | 3 + include/linux/blkdev.h | 4 +- include/linux/compiler.h | 2 - kernel/kthread.c | 7 ++- kernel/time/time.c | 6 ++- net/ipv4/tcp_input.c | 2 - net/key/af_key.c | 45 ++++++++++++++++---- net/mac80211/mlme.c | 25 ++++++++--- net/rds/ib_cm.c | 3 + sound/pci/hda/hda_controller.c | 4 +- sound/soc/cirrus/edb93xx.c | 2 - sound/soc/cirrus/ep93xx-i2s.c | 26 ++++++------ sound/soc/cirrus/snappercl15.c | 2 - sound/soc/soc-dapm.c | 2 + tools/Makefile | 20 +++++++-- tools/net/bpf_dbg.c | 7 ++- .../inter-event/trigger-multi-actions-accept.tc | 44 ++++++++++++++++++++ 82 files changed, 466 insertions(+), 230 deletions(-)