Merge tag 'v4.9.97' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.9-stable
[email protected] Sat, 16 Jun 2018 06:28:38 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994744AbeFPE2kjlIwJ/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 21:54:51 2018 +0200 Commit: 0335dfd4158dbfddc9111ee63038a5a661fbd46e Gitweb: https://git.linux-mips.org/g/ralf/linux/0335dfd4158d Branch: linux-4.9-stable --- Documentation/kernel-parameters.txt | 3 Makefile | 2 arch/s390/Kconfig | 47 +++++ arch/s390/Makefile | 10 + arch/s390/include/asm/alternative.h | 149 +++++++++++++++++ arch/s390/include/asm/barrier.h | 24 +++ arch/s390/include/asm/facility.h | 18 ++ arch/s390/include/asm/kvm_host.h | 3 arch/s390/include/asm/lowcore.h | 7 + arch/s390/include/asm/nospec-branch.h | 17 ++ arch/s390/include/asm/processor.h | 4 arch/s390/include/asm/thread_info.h | 4 arch/s390/include/uapi/asm/kvm.h | 5 - arch/s390/kernel/Makefile | 6 + arch/s390/kernel/alternative.c | 112 +++++++++++++ arch/s390/kernel/early.c | 5 + arch/s390/kernel/entry.S | 250 +++++++++++++++++++++++++--- arch/s390/kernel/ipl.c | 1 arch/s390/kernel/module.c | 65 +++++++ arch/s390/kernel/nospec-branch.c | 169 +++++++++++++++++++ arch/s390/kernel/processor.c | 18 ++ arch/s390/kernel/setup.c | 14 +- arch/s390/kernel/smp.c | 7 + arch/s390/kernel/uprobes.c | 9 + arch/s390/kernel/vmlinux.lds.S | 37 ++++ arch/s390/kvm/kvm-s390.c | 13 + arch/s390/kvm/vsie.c | 30 +++ arch/x86/kernel/tsc.c | 2 drivers/acpi/acpi_video.c | 27 +++ drivers/cdrom/cdrom.c | 2 drivers/gpu/drm/drm_dp_dual_mode_helper.c | 39 ++++ drivers/gpu/drm/i915/i915_drv.h | 6 + drivers/gpu/drm/i915/intel_display.c | 9 + drivers/gpu/drm/i915/intel_pm.c | 6 - drivers/gpu/drm/vc4/vc4_bo.c | 2 drivers/gpu/drm/vc4/vc4_validate_shaders.c | 1 drivers/i2c/busses/i2c-i801.c | 29 +++ drivers/infiniband/hw/mlx5/qp.c | 3 drivers/input/misc/drv260x.c | 2 drivers/media/usb/stkwebcam/stk-sensor.c | 6 - drivers/media/usb/stkwebcam/stk-webcam.c | 11 + drivers/media/usb/stkwebcam/stk-webcam.h | 2 drivers/message/fusion/mptsas.c | 1 drivers/net/bonding/bond_main.c | 3 drivers/net/ethernet/ti/cpsw.c | 2 drivers/net/ppp/pppoe.c | 4 drivers/net/team/team.c | 38 +++- drivers/net/usb/cdc_ether.c | 10 + drivers/net/usb/r8152.c | 2 drivers/net/wireless/ath/ath10k/mac.c | 5 - drivers/net/wireless/ath/ath9k/hw.c | 4 drivers/net/wireless/mac80211_hwsim.c | 7 + drivers/of/base.c | 2 drivers/pci/pci.c | 52 ++++-- drivers/pinctrl/intel/pinctrl-intel.c | 23 +-- drivers/power/supply/bq2415x_charger.c | 5 + drivers/s390/block/dasd_alias.c | 13 + drivers/s390/char/Makefile | 2 drivers/s390/cio/chsc.c | 14 +- drivers/usb/musb/musb_core.c | 8 + fs/cifs/dir.c | 9 + fs/jbd2/journal.c | 2 include/linux/if_vlan.h | 7 + include/net/llc_conn.h | 1 include/uapi/linux/kvm.h | 1 kernel/events/callchain.c | 21 +- kernel/events/core.c | 4 net/core/dev.c | 2 net/core/neighbour.c | 40 +++- net/dns_resolver/dns_key.c | 13 + net/ipv4/tcp.c | 6 - net/ipv4/tcp_input.c | 7 - net/ipv6/route.c | 2 net/l2tp/l2tp_ppp.c | 7 + net/llc/af_llc.c | 14 +- net/llc/llc_c_ac.c | 9 - net/llc/llc_conn.c | 22 ++ net/packet/af_packet.c | 82 ++++++--- net/packet/internal.h | 10 + net/sched/act_ife.c | 2 net/sctp/ipv6.c | 60 +++---- net/strparser/strparser.c | 7 - net/tipc/netlink.c | 3 tools/perf/util/dso.c | 16 -- 84 files changed, 1457 insertions(+), 261 deletions(-)