Merge tag 'v3.18.111' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable
[email protected] Sat, 16 Jun 2018 06:22:51 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994672AbeFPEWzGEith/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Jun 15 01:35:18 2018 +0200 Commit: b34893c8868a20213310fb5375e8a0293a0e5c60 Gitweb: https://git.linux-mips.org/g/ralf/linux/b34893c8868a Branch: linux-3.18-stable --- Documentation/device-mapper/thin-provisioning.txt | 8 +- Makefile | 2 arch/alpha/include/asm/xchg.h | 30 +++++- arch/arm/boot/dts/socfpga.dtsi | 2 arch/arm/mach-omap1/clock.c | 6 + arch/arm/mach-omap2/pm.c | 4 - arch/arm/plat-omap/dmtimer.c | 7 - arch/m68k/coldfire/device.c | 12 ++ arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 2 arch/mips/kernel/ptrace.c | 22 ++++- arch/mips/kernel/ptrace32.c | 4 - arch/mips/kvm/mips.c | 2 arch/mips/txx9/rbtx4939/setup.c | 4 - arch/powerpc/include/asm/irq_work.h | 1 arch/powerpc/perf/core-book3s.c | 25 +++++ arch/powerpc/sysdev/mpic.c | 2 arch/sh/kernel/entry-common.S | 2 arch/sparc/include/asm/atomic_64.h | 6 + arch/x86/kernel/smpboot.c | 1 arch/x86/kvm/vmx.c | 20 +++- arch/x86/kvm/x86.c | 7 + arch/x86/power/hibernate_32.c | 2 arch/x86/power/hibernate_64.c | 2 drivers/acpi/acpi_pad.c | 3 + drivers/acpi/acpica/evevent.c | 9 +- drivers/acpi/acpica/nseval.c | 8 ++ drivers/acpi/processor_perflib.c | 2 drivers/ata/libata-core.c | 4 + drivers/block/paride/pcd.c | 2 drivers/cdrom/cdrom.c | 3 - drivers/cdrom/gdrom.c | 3 + drivers/clk/samsung/clk-exynos3250.c | 4 - drivers/clk/samsung/clk-exynos5250.c | 8 +- drivers/clk/samsung/clk-exynos5260.c | 2 drivers/clk/samsung/clk-s3c2410.c | 16 ++- drivers/clocksource/fsl_ftm_timer.c | 2 drivers/dma/pl330.c | 6 + drivers/firewire/ohci.c | 8 +- drivers/firmware/dmi_scan.c | 22 ++--- drivers/gpu/drm/exynos/regs-fimc.h | 2 drivers/hid/hid-roccat-kovaplus.c | 2 drivers/hwmon/nct6775.c | 10 +- drivers/hwmon/pmbus/adm1275.c | 4 - drivers/hwmon/pmbus/max8688.c | 2 drivers/i2c/busses/i2c-mv64xxx.c | 8 +- drivers/ide/ide-cd.c | 2 drivers/infiniband/hw/mlx5/qp.c | 5 - drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 + drivers/irqchip/irq-gic-v3.c | 2 drivers/md/bcache/alloc.c | 4 + drivers/md/bcache/bcache.h | 2 drivers/md/bcache/btree.c | 9 +- drivers/md/bcache/request.c | 2 drivers/md/bcache/super.c | 23 ++++- drivers/md/bcache/sysfs.c | 11 +- drivers/md/bcache/writeback.c | 27 +++++- drivers/md/raid1.c | 11 ++ drivers/md/raid10.c | 6 + drivers/media/dvb-core/dmxdev.c | 2 drivers/media/pci/cx23885/cx23885-cards.c | 4 + drivers/media/pci/cx23885/cx23885-core.c | 10 ++ drivers/media/pci/cx25821/cx25821-core.c | 7 + drivers/media/platform/s3c-camif/camif-capture.c | 7 + drivers/media/usb/em28xx/em28xx.h | 2 drivers/message/fusion/mptctl.c | 2 drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 drivers/net/ethernet/intel/e1000e/mac.c | 2 drivers/net/ethernet/intel/e1000e/netdev.c | 4 - drivers/net/ethernet/marvell/mvneta.c | 1 drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 drivers/net/phy/dp83640.c | 18 ++++ drivers/net/usb/qmi_wwan.c | 4 + drivers/net/usb/r8152.c | 2 drivers/net/usb/smsc75xx.c | 7 + drivers/net/virtio_net.c | 2 drivers/net/wireless/ath/ath10k/mac.c | 10 ++ drivers/parisc/lba_pci.c | 20 ++++ drivers/pci/pci-driver.c | 17 ++-- drivers/pci/quirks.c | 5 + drivers/regulator/of_regulator.c | 1 drivers/rtc/rtc-tx4939.c | 6 + drivers/s390/cio/device_fsm.c | 7 + drivers/s390/cio/io_sch.h | 1 drivers/scsi/aacraid/commsup.c | 4 + drivers/scsi/aacraid/linit.c | 5 + drivers/scsi/arm/fas216.c | 2 drivers/scsi/bnx2fc/bnx2fc_io.c | 1 drivers/scsi/lpfc/lpfc_attr.c | 5 + drivers/scsi/lpfc/lpfc_hbadisc.c | 5 + drivers/scsi/lpfc/lpfc_sli.c | 2 drivers/scsi/qla2xxx/qla_isr.c | 6 + drivers/scsi/qla4xxx/ql4_def.h | 2 drivers/scsi/qla4xxx/ql4_os.c | 46 +++++++++ drivers/scsi/sd.c | 3 - drivers/scsi/sr.c | 21 ++++ drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 drivers/scsi/ufs/ufshcd.c | 2 drivers/staging/rtl8192u/r8192U_core.c | 2 drivers/tty/serial/arc_uart.c | 5 + drivers/tty/serial/fsl_lpuart.c | 4 + drivers/tty/serial/imx.c | 6 + drivers/tty/serial/samsung.c | 4 + drivers/tty/serial/xilinx_uartps.c | 2 drivers/usb/dwc2/core.h | 2 drivers/usb/dwc3/core.h | 2 drivers/usb/gadget/composite.c | 40 ++++---- drivers/usb/gadget/function/f_fs.c | 2 drivers/usb/gadget/function/f_uac2.c | 2 drivers/usb/gadget/udc/fsl_udc_core.c | 4 - drivers/usb/gadget/udc/goku_udc.h | 2 drivers/usb/host/ohci-hcd.c | 3 - drivers/usb/host/xhci-mem.c | 2 drivers/usb/musb/musb_core.c | 2 drivers/video/fbdev/sbuslib.c | 4 - drivers/watchdog/f71808e_wdt.c | 3 - drivers/watchdog/sp5100_tco.h | 2 drivers/xen/events/events_base.c | 4 - drivers/xen/grant-table.c | 4 - drivers/xen/swiotlb-xen.c | 2 drivers/xen/xen-acpi-processor.c | 6 + drivers/xen/xenbus/xenbus_probe.c | 5 + drivers/zorro/zorro.c | 12 ++ fs/affs/namei.c | 10 +- fs/aio.c | 4 - fs/btrfs/ctree.c | 12 ++ fs/btrfs/disk-io.c | 2 fs/btrfs/extent-tree.c | 1 fs/btrfs/inode.c | 16 +-- fs/btrfs/send.c | 3 + fs/btrfs/tests/qgroup-tests.c | 2 fs/btrfs/tree-log.c | 12 ++ fs/cifs/cifssmb.c | 4 - fs/dcache.c | 22 +++++ fs/ecryptfs/inode.c | 3 - fs/ext2/namei.c | 6 - fs/ext4/namei.c | 6 - fs/f2fs/namei.c | 12 +- fs/jffs2/dir.c | 12 +- fs/jffs2/fs.c | 1 fs/jfs/namei.c | 12 +- fs/nfs/nfs4sysctl.c | 2 fs/nilfs2/namei.c | 6 - fs/ocfs2/acl.c | 6 + fs/ocfs2/super.c | 5 - fs/ocfs2/xattr.c | 2 fs/proc/base.c | 29 ++++++ fs/proc/proc_sysctl.c | 3 + fs/reiserfs/namei.c | 12 +- fs/udf/namei.c | 6 - fs/udf/super.c | 5 + fs/ufs/namei.c | 6 - fs/xfs/xfs_discard.c | 14 +-- include/asm-generic/pgtable.h | 15 +++ include/linux/dcache.h | 1 include/linux/suspend.h | 2 include/linux/usb/composite.h | 3 + include/net/llc_conn.h | 2 include/net/mac80211.h | 2 include/net/regulatory.h | 2 include/trace/events/timer.h | 20 +++- include/uapi/linux/if_ether.h | 1 kernel/audit.c | 2 kernel/debug/kdb/kdb_main.c | 27 ++++-- kernel/events/core.c | 3 - kernel/power/power.h | 3 - kernel/relay.c | 2 kernel/sched/rt.c | 2 kernel/signal.c | 4 + mm/ksm.c | 28 ++++++ mm/mempolicy.c | 36 ++++++- mm/swapfile.c | 4 + mm/vmscan.c | 22 ++++- net/batman-adv/distributed-arp-table.c | 2 net/batman-adv/fragmentation.c | 3 - net/batman-adv/gateway_client.c | 3 + net/batman-adv/multicast.c | 4 - net/batman-adv/soft-interface.c | 8 -- net/bridge/netfilter/ebtables.c | 33 +++++-- net/core/skbuff.c | 9 +- net/ipv4/ip_vti.c | 2 net/ipv4/tcp_illinois.c | 2 net/ipv6/sit.c | 7 + net/llc/llc_c_ac.c | 15 ++- net/llc/llc_conn.c | 32 +++++-- net/netlabel/netlabel_unlabeled.c | 10 ++ net/nfc/llcp_commands.c | 4 + net/nfc/netlink.c | 3 - scripts/kconfig/expr.c | 2 scripts/kconfig/menu.c | 1 scripts/kconfig/zconf.y | 33 +++++-- security/integrity/ima/ima_crypto.c | 2 security/integrity/ima/ima_main.c | 13 +++ sound/core/vmaster.c | 5 + sound/soc/au1x/ac97c.c | 6 + tools/lib/traceevent/parse-filter.c | 10 ++ .../ftrace/test.d/kprobe/kprobe_args_string.tc | 46 +++++++++ .../ftrace/test.d/kprobe/kprobe_args_syntax.tc | 97 ++++++++++++++++++++ .../selftests/ftrace/test.d/kprobe/probepoint.tc | 43 +++++++++ tools/testing/selftests/memfd/config | 1 tools/thermal/tmon/sysfs.c | 12 +- tools/thermal/tmon/tmon.c | 1 201 files changed, 1218 insertions(+), 395 deletions(-)