Merge tag 'v4.4.118' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.4-stable
[email protected] Sat, 16 Jun 2018 06:24:45 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993881AbeFPEYrYB4i5/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 21:58:29 2018 +0200 Commit: 48b7d79e30fa015fc2605a25a2a79001b9ceb6c6 Gitweb: https://git.linux-mips.org/g/ralf/linux/48b7d79e30fa Branch: linux-4.4-stable --- Documentation/kernel-parameters.txt | 2 Documentation/speculation.txt | 90 + Makefile | 8 arch/arm/boot/dts/am4372.dtsi | 6 arch/arm/boot/dts/omap4.dtsi | 2 arch/arm/mach-omap2/omap-secure.c | 19 arch/arm/mach-omap2/omap-secure.h | 4 arch/arm/mach-omap2/pm.h | 4 arch/arm/mach-omap2/pm34xx.c | 13 arch/arm/mach-omap2/prm33xx.c | 12 arch/arm/mach-omap2/sleep34xx.S | 26 arch/arm/mach-tegra/Kconfig | 2 arch/arm64/Kconfig | 2 arch/arm64/Kconfig.platforms | 2 arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 arch/arm64/include/asm/bug.h | 33 arch/powerpc/perf/core-book3s.c | 4 arch/x86/Kconfig | 2 arch/x86/Kconfig.debug | 1 arch/x86/boot/Makefile | 5 arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 112 + arch/x86/entry/common.c | 2 arch/x86/include/asm/asm-prototypes.h | 1 arch/x86/include/asm/barrier.h | 28 arch/x86/include/asm/microcode_amd.h | 1 arch/x86/include/asm/msr.h | 3 arch/x86/include/asm/nospec-branch.h | 8 arch/x86/include/asm/vmx.h | 5 arch/x86/kernel/alternative.c | 14 arch/x86/kernel/cpu/bugs.c | 122 + arch/x86/kernel/cpu/mcheck/mce-inject.c | 5 arch/x86/kernel/cpu/microcode/amd.c | 17 arch/x86/kernel/cpu/perf_event.c | 4 arch/x86/kernel/head_32.S | 9 arch/x86/kvm/Kconfig | 3 arch/x86/kvm/emulate.c | 9 arch/x86/kvm/vmx.c | 83 - arch/x86/kvm/x86.c | 40 arch/x86/lib/getuser.S | 10 arch/x86/lib/retpoline.S | 1 arch/x86/math-emu/Makefile | 4 arch/x86/math-emu/reg_compare.c | 16 arch/x86/mm/ioremap.c | 4 arch/x86/mm/kmmio.c | 12 arch/x86/platform/olpc/olpc-xo15-sci.c | 2 certs/Makefile | 33 drivers/Makefile | 1 drivers/android/binder.c | 2 drivers/char/hw_random/exynos-rng.c | 10 drivers/crypto/s5p-sss.c | 13 drivers/dma/at_hdmac.c | 4 drivers/dma/dma-jz4740.c | 4 drivers/dma/ioat/init.c | 2 drivers/dma/zx296702_dma.c | 2 drivers/gpio/gpio-intel-mid.c | 2 drivers/gpio/gpio-xgene.c | 13 drivers/gpu/drm/armada/armada_crtc.c | 25 drivers/gpu/drm/drm_modeset_lock.c | 2 drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 10 drivers/gpu/drm/gma500/mdfld_dsi_output.c | 12 drivers/gpu/drm/nouveau/nouveau_gem.c | 2 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 7 drivers/hv/hv.c | 5 drivers/i2c/i2c-boardinfo.c | 4 drivers/idle/Kconfig | 1 drivers/iio/adc/axp288_adc.c | 2 drivers/infiniband/core/cma.c | 1 drivers/infiniband/hw/cxgb4/device.c | 5 drivers/input/keyboard/tca8418_keypad.c | 21 drivers/isdn/hardware/eicon/message.c | 16 drivers/isdn/icn/icn.c | 2 drivers/isdn/sc/init.c | 7 drivers/md/md.c | 10 drivers/media/common/b2c2/flexcop-fe-tuner.c | 4 drivers/media/i2c/s5k6aa.c | 5 drivers/media/i2c/tc358743.c | 46 - drivers/media/usb/em28xx/Kconfig | 2 drivers/media/usb/go7007/Kconfig | 2 drivers/media/usb/hdpvr/hdpvr-core.c | 2 drivers/media/usb/pwc/pwc-if.c | 2 drivers/media/v4l2-core/Kconfig | 1 drivers/message/fusion/mptbase.c | 2 drivers/mtd/chips/Kconfig | 4 drivers/mtd/maps/ck804xrom.c | 4 drivers/mtd/maps/esb2rom.c | 4 drivers/mtd/maps/ichxrom.c | 10 drivers/mtd/nand/sh_flctl.c | 5 drivers/net/Kconfig | 3 drivers/net/ethernet/3com/3c509.c | 2 drivers/net/ethernet/3com/3c59x.c | 2 drivers/net/ethernet/amd/xgbe/xgbe-main.c | 4 drivers/net/ethernet/dec/tulip/de4x5.c | 2 drivers/net/ethernet/freescale/gianfar.c | 6 drivers/net/ethernet/hp/hp100.c | 20 drivers/net/ethernet/ti/tlan.c | 2 drivers/net/hippi/rrunner.c | 2 drivers/net/ipvlan/ipvlan_core.c | 1 drivers/net/usb/Kconfig | 10 drivers/net/usb/Makefile | 2 drivers/net/wireless/cw1200/cw1200_spi.c | 9 drivers/net/wireless/cw1200/pm.h | 9 drivers/net/wireless/cw1200/wsm.c | 8 .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 6 drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 6 drivers/platform/x86/Kconfig | 2 drivers/platform/x86/intel_mid_thermal.c | 2 drivers/platform/x86/tc1100-wmi.c | 2 drivers/power/Kconfig | 1 drivers/power/bq27xxx_battery.c | 6 drivers/s390/block/dasd_eckd.c | 16 drivers/scsi/advansys.c | 24 drivers/scsi/dpt_i2o.c | 3 drivers/scsi/fdomain.c | 2 drivers/scsi/g_NCR5380.c | 5 drivers/scsi/initio.c | 16 drivers/scsi/mvumi.c | 4 drivers/scsi/sim710.c | 3 drivers/spi/spi-sun4i.c | 2 drivers/ssb/main.c | 7 drivers/staging/android/ashmem.c | 19 drivers/staging/iio/adc/ad7192.c | 27 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 7 drivers/staging/unisys/visorinput/Kconfig | 2 drivers/staging/wilc1000/wilc_wlan_if.h | 1 drivers/target/target_core_user.c | 2 drivers/thermal/Kconfig | 4 drivers/thermal/spear_thermal.c | 6 drivers/tty/Kconfig | 2 drivers/tty/hvc/hvc_xen.c | 2 drivers/tty/serial/8250/Kconfig | 2 drivers/usb/host/Kconfig | 2 drivers/usb/musb/ux500_dma.c | 3 drivers/usb/phy/Kconfig | 1 drivers/usb/usbip/stub_dev.c | 3 drivers/usb/usbip/vhci_hcd.c | 2 drivers/video/fbdev/Kconfig | 1 drivers/video/fbdev/auo_k190x.c | 11 drivers/video/fbdev/exynos/s6e8ax0.c | 13 drivers/video/fbdev/intelfb/intelfbdrv.c | 2 drivers/video/fbdev/mmp/core.c | 5 drivers/video/fbdev/sis/init301.c | 10 drivers/video/fbdev/sm712fb.c | 16 drivers/video/fbdev/via/viafbdev.c | 8 drivers/virtio/virtio_balloon.c | 2 drivers/xen/Kconfig | 2 fs/btrfs/ioctl.c | 2 fs/compat_binfmt_elf.c | 2 fs/ncpfs/dir.c | 3 fs/reiserfs/lbalance.c | 2 fs/reiserfs/reiserfs.h | 1 include/linux/device.h | 7 include/linux/fdtable.h | 5 include/linux/init.h | 9 include/linux/module.h | 9 include/linux/msi.h | 11 include/linux/mtd/sh_flctl.h | 1 include/linux/nospec.h | 72 + include/linux/string.h | 1 include/net/dst_cache.h | 97 + include/net/ip6_tunnel.h | 15 include/net/netlink.h | 73 + include/net/red.h | 13 include/trace/events/clk.h | 4 kernel/module.c | 11 kernel/profile.c | 4 kernel/trace/blktrace.c | 32 lib/Kconfig.debug | 2 lib/oid_registry.c | 8 mm/early_ioremap.c | 2 mm/util.c | 24 mm/vmscan.c | 3 net/Kconfig | 4 net/core/Makefile | 1 net/core/dev.c | 2 net/core/dst_cache.c | 168 ++ net/decnet/af_decnet.c | 62 - net/ipv4/ip_sockglue.c | 14 net/ipv4/ipconfig.c | 4 net/ipv4/netfilter/ipt_CLUSTERIP.c | 16 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 net/ipv6/Kconfig | 1 net/ipv6/ip6_gre.c | 12 net/ipv6/ip6_tunnel.c | 149 -- net/ipv6/ip6_vti.c | 2 net/ipv6/ipv6_sockglue.c | 17 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 18 net/netfilter/ipvs/ip_vs_app.c | 8 net/netfilter/ipvs/ip_vs_ctl.c | 15 net/netfilter/x_tables.c | 10 net/netfilter/xt_RATEEST.c | 22 net/sched/sch_choke.c | 3 net/sched/sch_gred.c | 3 net/sched/sch_red.c | 2 net/sched/sch_sfq.c | 3 net/wireless/core.c | 8 net/wireless/nl80211.c | 9 net/xfrm/xfrm_policy.c | 8 net/xfrm/xfrm_user.c | 24 scripts/genksyms/parse.tab.c_shipped | 1682 +++++++++----------- scripts/genksyms/parse.tab.h_shipped | 133 +- scripts/genksyms/parse.y | 2 scripts/kernel-doc | 2 scripts/mod/modpost.c | 9 security/selinux/ss/services.c | 21 sound/pci/hda/patch_ca0132.c | 3 sound/soc/intel/Kconfig | 7 sound/soc/mediatek/Kconfig | 4 sound/soc/rockchip/rockchip_spdif.c | 22 sound/soc/ux500/mop500.c | 4 sound/soc/ux500/ux500_pcm.c | 5 tools/build/Makefile.build | 10 tools/perf/bench/numa.c | 56 + tools/perf/builtin-top.c | 15 tools/scripts/Makefile.include | 12 214 files changed, 2527 insertions(+), 1873 deletions(-)