Merge tag 'v4.1.51' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.1-stable
[email protected] Sat, 16 Jun 2018 06:24:01 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994683AbeFPEYEP00fR/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 22:04:01 2018 +0200 Commit: 4680351a4197032d5003d732344ffdca84d073f3 Gitweb: https://git.linux-mips.org/g/ralf/linux/4680351a4197 Branch: linux-4.1-stable --- Makefile | 2 arch/arm/include/asm/kvm_emulate.h | 12 ++ arch/arm/kvm/mmio.c | 5 + arch/arm/mach-mvebu/Kconfig | 4 - arch/arm/mach-omap2/omap-secure.c | 2 arch/arm64/include/asm/kvm_emulate.h | 13 ++ arch/mips/ath25/board.c | 2 arch/mips/cavium-octeon/octeon-irq.c | 2 arch/mips/kernel/smp-bmips.c | 8 + arch/sh/boards/mach-se/770x/setup.c | 10 +- arch/x86/kernel/cpu/mcheck/mce.c | 22 ++++ arch/x86/kernel/machine_kexec_64.c | 1 arch/x86/kernel/module.c | 14 ++ arch/x86/lib/checksum_32.S | 7 + arch/x86/tools/relocs.c | 3 + block/blk-cgroup.c | 4 - drivers/block/loop.c | 2 drivers/char/tpm/st33zp24/st33zp24.c | 4 - drivers/char/tpm/tpm_i2c_infineon.c | 5 + drivers/char/tpm/tpm_i2c_nuvoton.c | 8 + drivers/cpufreq/s3c24xx-cpufreq.c | 8 + drivers/gpu/drm/radeon/cik.c | 31 ------ drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 drivers/infiniband/core/ucma.c | 6 + drivers/infiniband/hw/mlx5/cq.c | 7 + drivers/input/keyboard/matrix_keypad.c | 4 + drivers/input/keyboard/tca8418_keypad.c | 2 drivers/leds/led-core.c | 2 drivers/leds/led-triggers.c | 12 +- drivers/md/bcache/super.c | 11 ++ drivers/md/dm-io.c | 1 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 6 + drivers/mtd/ubi/vmt.c | 15 ++- drivers/net/ethernet/arc/emac_main.c | 53 ++++++--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 - drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 14 ++ drivers/net/ethernet/broadcom/tg3.c | 13 ++ drivers/net/ethernet/broadcom/tg3.h | 4 + drivers/net/ethernet/freescale/gianfar_ptp.c | 3 - drivers/net/ethernet/intel/e1000/e1000.h | 3 - drivers/net/ethernet/intel/e1000/e1000_main.c | 27 ++++- drivers/net/phy/mdio-sun4i.c | 6 + drivers/net/ppp/ppp_generic.c | 9 ++ drivers/net/wan/hdlc_ppp.c | 5 + drivers/net/xen-netfront.c | 1 drivers/s390/block/dasd_3990_erp.c | 10 ++ drivers/s390/net/qeth_core.h | 5 + drivers/s390/net/qeth_core_main.c | 33 +++--- drivers/scsi/qla2xxx/qla_init.c | 1 drivers/scsi/qla2xxx/qla_target.c | 2 drivers/scsi/storvsc_drv.c | 3 - drivers/spi/spi-atmel.c | 2 drivers/staging/android/ashmem.c | 15 +-- drivers/tty/serial/8250/8250_pci.c | 11 ++ drivers/tty/serial/atmel_serial.c | 1 drivers/tty/serial/sh-sci.c | 2 drivers/usb/core/message.c | 4 + drivers/usb/core/quirks.c | 3 - drivers/usb/gadget/function/f_fs.c | 1 drivers/usb/mon/mon_text.c | 124 ++++++++++++++-------- drivers/usb/storage/uas.c | 2 drivers/usb/storage/unusual_devs.h | 7 + drivers/watchdog/hpwdt.c | 12 ++ drivers/xen/gntdev.c | 8 + fs/btrfs/acl.c | 19 ++- fs/super.c | 6 + fs/xfs/xfs_qm.c | 46 +++++--- include/linux/nospec.h | 4 - include/linux/usb/quirks.h | 3 + include/linux/workqueue.h | 1 include/net/udplite.h | 1 kernel/time/hrtimer.c | 7 + kernel/workqueue.c | 16 +++ lib/mpi/longlong.h | 18 +++ net/bridge/br_sysfs_if.c | 3 + net/bridge/netfilter/ebt_among.c | 21 +++- net/bridge/netfilter/ebtables.c | 13 ++ net/core/dev.c | 11 ++ net/ipv4/route.c | 8 + net/ipv4/udp.c | 5 + net/ipv6/ip6_checksum.c | 5 + net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 4 + net/ipv6/route.c | 1 net/ipv6/sit.c | 2 net/netfilter/nf_nat_proto_common.c | 7 + net/netfilter/xt_IDLETIMER.c | 9 +- net/netfilter/xt_LED.c | 12 +- net/netlink/genetlink.c | 12 ++ net/sctp/sm_make_chunk.c | 8 + net/sctp/socket.c | 16 ++- sound/core/seq/seq_clientmgr.c | 21 ++-- sound/core/seq/seq_fifo.c | 2 sound/core/seq/seq_memory.c | 14 ++ sound/core/seq/seq_memory.h | 3 - sound/pci/hda/patch_realtek.c | 16 +++ sound/usb/quirks-table.h | 47 ++++++++ 96 files changed, 725 insertions(+), 261 deletions(-)