Merge tag 'v3.18.51' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.18-stable
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992110AbdFFRRNHL0hq/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue Jun 6 16:05:38 2017 +0200 Commit: 445fa9503f08e820dc2f93a61240c7d77e95d195 Gitweb: https://git.linux-mips.org/g/ralf/linux/445fa9503f08 Branch: linux-3.18-stable --- Makefile | 2 arch/arm/kernel/head-nommu.S | 20 +--- arch/arm/kvm/mmu.c | 12 ++ arch/arm/mm/cache-l2x0.c | 111 +++++++------------- arch/arm64/kernel/entry.S | 4 - arch/arm64/kernel/traps.c | 28 ++++- arch/mips/include/asm/compiler.h | 13 ++ arch/mips/jz4740/board-qi_lb60.c | 1 arch/mips/jz4740/gpio.c | 1 arch/mips/pci/ops-pmcmsp.c | 12 -- arch/mips/ralink/prom.c | 9 +- arch/powerpc/kernel/entry_64.S | 6 + arch/s390/include/asm/pgtable.h | 2 arch/x86/configs/tiny.config | 2 arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 drivers/acpi/power.c | 1 drivers/clk/at91/clk-usb.c | 4 - drivers/input/mouse/elantech.c | 8 + drivers/iommu/intel-iommu.c | 1 drivers/md/dm-bufio.c | 1 drivers/media/tuners/tuner-xc2028.c | 3 - drivers/misc/ioc4.c | 31 +++--- drivers/mmc/host/sdhci-esdhc-imx.c | 1 drivers/mmc/host/sunxi-mmc.c | 5 + drivers/mtd/ubi/upd.c | 8 + drivers/net/ethernet/dec/tulip/tulip_core.c | 9 +- drivers/net/ethernet/dec/tulip/winbond-840.c | 2 drivers/net/ethernet/neterion/vxge/vxge-main.c | 31 ++---- drivers/net/ethernet/ti/cpmac.c | 5 + drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 2 drivers/net/wireless/hostap/hostap_hw.c | 15 ++- drivers/scsi/aic94xx/aic94xx_sds.c | 5 + drivers/staging/android/ion/ion.c | 55 ++++++++-- drivers/tty/nozomi.c | 2 drivers/usb/gadget/legacy/inode.c | 1 drivers/vfio/pci/vfio_pci.c | 33 ++++-- drivers/vfio/pci/vfio_pci_intrs.c | 2 fs/btrfs/extent_io.c | 2 fs/cifs/cifsglob.h | 1 fs/cifs/netmisc.c | 12 +- fs/cifs/smb1ops.c | 10 ++ fs/cifs/smb2pdu.c | 5 - fs/gfs2/dir.c | 4 - fs/nfs/nfs4proc.c | 11 +- fs/nfsd/nfs4state.c | 3 - include/linux/ftrace_event.h | 2 include/linux/perf_event.h | 28 ++++- include/trace/ftrace.h | 7 + kernel/configs/tiny.config | 8 + kernel/events/core.c | 23 +++- kernel/sched/core.c | 2 kernel/trace/ring_buffer.c | 16 +++ kernel/trace/trace.c | 8 + kernel/trace/trace_event_perf.c | 4 + kernel/trace/trace_kprobe.c | 4 - kernel/trace/trace_syscalls.c | 4 - kernel/trace/trace_uprobe.c | 2 mm/page_alloc.c | 17 ++- net/ipv4/ping.c | 5 + security/keys/gc.c | 2 security/keys/keyctl.c | 20 ++-- security/keys/process_keys.c | 44 +++++--- 62 files changed, 408 insertions(+), 286 deletions(-)