Merge tag 'v4.9.103' 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:29:13 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994753AbeFPE3PXu10J/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Jun 15 01:24:32 2018 +0200 Commit: 648e946567170348fd6666791c3f0177da49a56b Gitweb: https://git.linux-mips.org/g/ralf/linux/648e94656717 Branch: linux-4.9-stable --- Makefile | 2 arch/s390/crypto/crc32be-vx.S | 5 - arch/s390/crypto/crc32le-vx.S | 4 arch/s390/include/asm/alternative-asm.h | 108 ++++++++++++ arch/s390/include/asm/nospec-insn.h | 195 ++++++++++++++++++++++ arch/s390/kernel/Makefile | 1 arch/s390/kernel/asm-offsets.c | 1 arch/s390/kernel/base.S | 24 ++- arch/s390/kernel/entry.S | 105 +++--------- arch/s390/kernel/mcount.S | 14 +- arch/s390/kernel/nospec-branch.c | 43 ++--- arch/s390/kernel/nospec-sysfs.c | 21 ++ arch/s390/kernel/reipl.S | 7 + arch/s390/kernel/swsusp.S | 9 + arch/s390/lib/mem.S | 9 + arch/s390/net/bpf_jit.S | 16 +- arch/s390/net/bpf_jit_comp.c | 63 +++++++ arch/x86/kernel/machine_kexec_32.c | 6 + arch/x86/kernel/machine_kexec_64.c | 4 drivers/bluetooth/btusb.c | 6 + drivers/clk/clk.c | 3 drivers/clk/rockchip/clk-mmc-phase.c | 23 +++ drivers/clk/rockchip/clk-rk3228.c | 2 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-exynos5433.c | 12 + drivers/clk/samsung/clk-exynos7.c | 2 drivers/clk/samsung/clk-s3c2410.c | 16 +- drivers/clk/tegra/clk-pll.c | 2 drivers/crypto/sunxi-ss/sun4i-ss-core.c | 1 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/platform/vivid/vivid-ctrls.c | 2 drivers/media/usb/em28xx/em28xx.h | 2 drivers/media/v4l2-core/videobuf2-vmalloc.c | 2 drivers/message/fusion/mptctl.c | 2 drivers/net/ethernet/mellanox/mlx4/main.c | 4 drivers/net/usb/qmi_wwan.c | 4 drivers/net/vmxnet3/vmxnet3_drv.c | 72 +++++--- drivers/rtc/hctosys.c | 5 + drivers/rtc/rtc-snvs.c | 15 +- drivers/rtc/rtc-tx4939.c | 6 - drivers/s390/scsi/zfcp_dbf.c | 23 ++- drivers/s390/scsi/zfcp_ext.h | 5 - drivers/s390/scsi/zfcp_scsi.c | 14 +- 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/libsas/sas_scsi_host.c | 33 +--- drivers/scsi/lpfc/lpfc_attr.c | 5 + drivers/scsi/lpfc/lpfc_hbadisc.c | 5 - drivers/scsi/lpfc/lpfc_sli.c | 2 drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 drivers/scsi/mvsas/mv_94xx.c | 23 +-- 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/sg.c | 2 drivers/scsi/storvsc_drv.c | 2 drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 drivers/scsi/ufs/ufshcd.c | 2 drivers/staging/lustre/lustre/include/obd.h | 2 drivers/staging/lustre/lustre/lmv/lmv_obd.c | 2 drivers/staging/lustre/lustre/osc/osc_cache.c | 2 drivers/staging/rtl8192u/r8192U_core.c | 2 drivers/tty/serial/8250/8250_port.c | 3 drivers/tty/serial/arc_uart.c | 5 + drivers/tty/serial/fsl_lpuart.c | 4 drivers/tty/serial/imx.c | 6 + drivers/tty/serial/mxs-auart.c | 4 drivers/tty/serial/samsung.c | 4 drivers/tty/serial/xilinx_uartps.c | 2 drivers/usb/class/cdc-acm.c | 9 + drivers/usb/dwc2/core.h | 2 drivers/usb/dwc2/gadget.c | 12 + drivers/usb/dwc2/hcd.c | 14 +- drivers/usb/dwc3/core.c | 16 ++ drivers/usb/dwc3/core.h | 2 drivers/usb/dwc3/dwc3-omap.c | 16 ++ drivers/usb/gadget/composite.c | 40 ++--- drivers/usb/gadget/function/f_fs.c | 6 + drivers/usb/gadget/function/f_uac2.c | 2 drivers/usb/gadget/udc/core.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 fs/ext2/inode.c | 10 - fs/hfsplus/super.c | 1 include/linux/usb/composite.h | 3 include/uapi/linux/nl80211.h | 2 net/core/sock.c | 2 net/ipv4/ip_output.c | 3 net/ipv4/tcp_output.c | 7 + net/ipv6/ip6_output.c | 3 net/packet/af_packet.c | 4 net/wireless/core.c | 3 sound/soc/au1x/ac97c.c | 6 - sound/soc/samsung/i2s.c | 13 + sound/soc/soc-topology.c | 3 sound/usb/quirks.c | 29 ++- 107 files changed, 974 insertions(+), 334 deletions(-)