Merge tag 'v3.18.101' 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:21:58 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993880AbeFPEWBFteEh/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 22:10:08 2018 +0200 Commit: 3a1edbd075b832e3c1f448191586005847c0f605 Gitweb: https://git.linux-mips.org/g/ralf/linux/3a1edbd075b8 Branch: linux-3.18-stable --- Makefile | 2 - arch/arm/boot/dts/am335x-pepper.dts | 2 - arch/arm/boot/dts/moxart-uc7112lx.dts | 2 - arch/arm/boot/dts/moxart.dtsi | 17 ++++---- arch/arm/boot/dts/omap3-n900.dts | 4 +- arch/arm/boot/dts/r8a7790.dtsi | 7 ++- arch/arm/boot/dts/r8a7791.dtsi | 7 ++- arch/mips/net/bpf_jit.c | 16 ++++++-- arch/powerpc/mm/fault.c | 2 - arch/x86/kernel/kprobes/core.c | 6 +++ arch/x86/kernel/kprobes/opt.c | 3 + block/blk-throttle.c | 11 +++++ drivers/gpu/drm/drm_irq.c | 14 ++++++- drivers/gpu/drm/radeon/radeon_display.c | 6 +++ drivers/hid/hid-elo.c | 6 +++ drivers/hid/hid-input.c | 20 +++++++--- drivers/input/touchscreen/tsc2007.c | 8 ++++ drivers/iommu/iova.c | 2 - drivers/media/i2c/soc_camera/ov6650.c | 2 - drivers/media/usb/cpia2/cpia2_v4l.c | 4 +- drivers/mtd/nand/nand_base.c | 9 +++- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 1 drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 1 drivers/net/ethernet/faraday/ftgmac100.c | 1 drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 - drivers/net/veth.c | 3 + drivers/net/wireless/ath/ath10k/debug.c | 9 ++++ drivers/net/wireless/ath/wil6210/main.c | 20 ++++++++-- drivers/of/device.c | 2 - drivers/pci/pci-driver.c | 2 - drivers/scsi/ipr.c | 16 ++++++-- drivers/scsi/scsi_devinfo.c | 2 - drivers/scsi/sg.c | 36 ++++++++++------- drivers/spi/spi-omap2-mcspi.c | 9 ++-- drivers/spi/spi-sun6i.c | 2 - drivers/usb/gadget/udc/dummy_hcd.c | 20 ++++------ drivers/video/fbdev/amba-clcd.c | 4 +- fs/aio.c | 42 ++++++++++++++------ fs/dcache.c | 11 ++++- fs/reiserfs/journal.c | 2 - fs/reiserfs/reiserfs.h | 1 fs/reiserfs/super.c | 21 +++++++--- include/linux/pagemap.h | 4 +- include/linux/platform_data/isl9305.h | 2 - include/net/tcp.h | 8 ++-- kernel/printk/braille.c | 15 ++++--- kernel/printk/braille.h | 13 +++++- kernel/sched/core.c | 3 + kernel/time/sched_clock.c | 5 ++ net/batman-adv/bridge_loop_avoidance.c | 20 ++++++++-- net/mac80211/iface.c | 2 - net/sched/act_csum.c | 12 ++++++ net/xfrm/xfrm_policy.c | 2 - net/xfrm/xfrm_state.c | 7 +++ security/apparmor/lsm.c | 2 - security/integrity/ima/ima_appraise.c | 3 + security/selinux/hooks.c | 8 ++++ sound/core/oss/pcm_oss.c | 10 +++-- sound/core/seq/seq_clientmgr.c | 4 +- sound/core/seq/seq_prioq.c | 28 +++++++------ sound/core/seq/seq_prioq.h | 6 +-- sound/core/seq/seq_queue.c | 28 ++++--------- sound/soc/nuc900/nuc900-ac97.c | 4 +- tools/perf/util/event.c | 4 +- tools/perf/util/ordered-events.c | 3 + tools/perf/util/session.c | 17 +++++++- .../testing/selftests/rcutorture/bin/configinit.sh | 2 - tools/usb/usbip/src/usbipd.c | 2 - 68 files changed, 389 insertions(+), 182 deletions(-)