Merge tag 'v4.1.49' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.1-stable
[email protected] Fri, 02 Feb 2018 13:20:32 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992973AbeBBMUeY034P/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Feb 2 13:04:59 2018 +0100 Commit: a1ff99cc39090ecd8199babdc57e88bcd21403b3 Gitweb: https://git.linux-mips.org/g/ralf/linux/a1ff99cc3909 Branch: linux-4.1-stable --- Makefile | 6 + arch/arm/include/asm/floppy.h | 2 arch/arm/include/asm/kvm_arm.h | 1 arch/arm/kvm/handle_exit.c | 19 ++ arch/arm/mach-omap1/dma.c | 16 +- arch/arm/mach-omap2/gpmc-onenand.c | 10 + arch/arm/mach-ux500/pm.c | 4 - arch/arm64/include/asm/kvm_arm.h | 3 arch/arm64/include/asm/uaccess.h | 8 + arch/arm64/kernel/hw_breakpoint.c | 3 arch/arm64/kernel/process.c | 9 + arch/blackfin/Kconfig | 7 + arch/blackfin/Kconfig.debug | 1 arch/c6x/kernel/ptrace.c | 41 ----- arch/metag/kernel/ptrace.c | 19 ++ arch/mips/configs/ip27_defconfig | 1 arch/mips/dec/int-handler.S | 40 +++++ arch/mips/kernel/ptrace.c | 3 arch/mips/lantiq/irq.c | 38 ++--- arch/mips/ralink/prom.c | 9 + arch/mips/ralink/rt288x.c | 10 - arch/mips/ralink/rt305x.c | 11 - arch/mips/ralink/rt3883.c | 10 - arch/mips/sgi-ip22/Platform | 2 arch/openrisc/include/asm/uaccess.h | 2 arch/powerpc/kvm/emulate.c | 1 arch/powerpc/perf/hv-24x7.c | 2 arch/powerpc/platforms/powernv/opal-async.c | 6 - arch/powerpc/platforms/powernv/setup.c | 2 arch/powerpc/sysdev/axonram.c | 5 + arch/powerpc/sysdev/ipic.c | 4 - arch/s390/include/asm/pci_insn.h | 2 arch/s390/kernel/setup.c | 8 + arch/s390/pci/pci.c | 5 - arch/s390/pci/pci_dma.c | 16 +- arch/s390/pci/pci_insn.c | 6 + arch/sparc/kernel/ptrace_64.c | 2 arch/sparc/mm/init_64.c | 9 + arch/x86/crypto/ghash-clmulni-intel_glue.c | 26 +++ arch/x86/crypto/salsa20_glue.c | 7 - arch/x86/kernel/kprobes/ftrace.c | 23 ++- arch/x86/kvm/vmx.c | 11 + arch/x86/pci/broadcom_bus.c | 2 block/scsi_ioctl.c | 3 crypto/Makefile | 2 crypto/algif_hash.c | 2 crypto/asymmetric_keys/x509_cert_parser.c | 2 crypto/cryptd.c | 1 crypto/hmac.c | 6 + crypto/mcryptd.c | 1 crypto/salsa20_generic.c | 7 - crypto/shash.c | 5 - drivers/acpi/video.c | 3 drivers/ata/libata-sff.c | 1 drivers/atm/horizon.c | 2 drivers/base/isa.c | 10 + drivers/bluetooth/btusb.c | 5 + drivers/bus/arm-ccn.c | 1 drivers/char/tpm/tpm_tis.c | 2 drivers/clk/tegra/clk-tegra30.c | 2 drivers/crypto/s5p-sss.c | 5 - drivers/dma/dmaengine.c | 2 drivers/dma/dmatest.c | 55 ++++--- drivers/dma/pl330.c | 19 +- drivers/edac/i5000_edac.c | 8 + drivers/edac/i5400_edac.c | 9 + drivers/edac/sb_edac.c | 1 drivers/gpio/gpio-74xx-mmio.c | 2 drivers/hv/hv_balloon.c | 4 - drivers/i2c/busses/i2c-riic.c | 6 + drivers/iio/adc/ti_am335x_adc.c | 13 ++ .../iio/common/hid-sensors/hid-sensor-trigger.c | 6 - drivers/iio/pressure/mpl115.c | 1 drivers/iio/pressure/mpl3115.c | 4 - drivers/infiniband/hw/mlx4/qp.c | 2 drivers/infiniband/hw/mlx5/main.c | 2 drivers/infiniband/ulp/ipoib/ipoib_ib.c | 7 + drivers/input/serio/i8042-x86ia64io.h | 7 + drivers/iommu/intel-iommu.c | 8 + drivers/irqchip/irq-crossbar.c | 8 + drivers/md/bcache/bcache.h | 4 - drivers/md/bcache/btree.c | 40 +++-- drivers/md/bcache/btree.h | 3 drivers/md/bcache/request.c | 23 ++- drivers/md/bcache/super.c | 8 + drivers/md/dm.c | 55 +++++++ drivers/md/md-cluster.c | 1 drivers/md/raid10.c | 4 - drivers/md/raid5.c | 5 + drivers/media/usb/dvb-usb/dibusb-common.c | 16 ++ drivers/media/usb/uvc/uvc_driver.c | 118 +++++++++++++++ drivers/media/usb/uvc/uvc_queue.c | 2 drivers/memory/omap-gpmc.c | 4 - drivers/mtd/maps/pmcmsp-flash.c | 4 - drivers/net/appletalk/ipddp.c | 2 drivers/net/can/ti_hecc.c | 3 drivers/net/can/usb/ems_usb.c | 2 drivers/net/can/usb/esd_usb2.c | 2 drivers/net/can/usb/kvaser_usb.c | 13 +- drivers/net/can/usb/usb_8dev.c | 2 drivers/net/ethernet/broadcom/bcmsysport.c | 23 +-- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 20 ++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 23 +-- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 97 ++++++++++--- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 10 + drivers/net/ethernet/dec/tulip/tulip_core.c | 9 + drivers/net/ethernet/dec/tulip/winbond-840.c | 2 drivers/net/ethernet/freescale/fec_main.c | 23 +-- drivers/net/ethernet/intel/igb/e1000_phy.c | 4 + drivers/net/ethernet/mellanox/mlx4/cmd.c | 11 + drivers/net/ethernet/mellanox/mlx4/main.c | 11 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 drivers/net/ethernet/ti/cpmac.c | 2 drivers/net/irda/w83977af_ir.c | 4 - drivers/net/macvlan.c | 2 drivers/net/phy/marvell.c | 2 drivers/net/phy/spi_ks8995.c | 1 drivers/net/ppp/ppp_generic.c | 1 drivers/net/vxlan.c | 2 drivers/net/wimax/i2400m/usb.c | 3 drivers/net/wireless/ath/ath9k/tx99.c | 5 + drivers/net/wireless/mac80211_hwsim.c | 5 + drivers/pci/iov.c | 70 +++++++-- drivers/pci/pci.c | 30 ---- drivers/pci/pci.h | 7 - drivers/pci/pcie/pme.c | 5 + drivers/pci/probe.c | 3 drivers/pci/remove.c | 2 drivers/pci/rom.c | 5 + drivers/pci/setup-res.c | 43 ++++-- drivers/pinctrl/Kconfig | 3 drivers/rtc/interface.c | 16 ++ drivers/rtc/rtc-s35390a.c | 153 +++++++++++++++----- drivers/scsi/bfa/bfad_debugfs.c | 5 - drivers/scsi/hpsa.c | 16 ++ drivers/scsi/hpsa.h | 1 drivers/scsi/lpfc/lpfc_els.c | 14 +- drivers/scsi/lpfc/lpfc_hw4.h | 2 drivers/scsi/lpfc/lpfc_sli.c | 9 + drivers/scsi/mvsas/mv_sas.c | 4 - drivers/scsi/scsi_devinfo.c | 2 drivers/scsi/scsi_lib.c | 3 drivers/scsi/sd.c | 9 + drivers/scsi/storvsc_drv.c | 34 +++- drivers/spi/spi-sh-msiof.c | 2 drivers/staging/lustre/lustre/llite/llite_mmap.c | 4 - drivers/staging/vt6655/device_main.c | 3 drivers/target/iscsi/iscsi_target.c | 3 drivers/target/iscsi/iscsi_target_configfs.c | 3 drivers/target/target_core_alua.c | 8 - drivers/target/target_core_file.c | 4 + drivers/target/target_core_pr.c | 4 - drivers/thermal/step_wise.c | 11 + drivers/tty/n_hdlc.c | 143 +++++++++---------- drivers/tty/serial/8250/8250_fintek.c | 2 drivers/tty/serial/8250/8250_pci.c | 24 +++ drivers/tty/sysrq.c | 9 + drivers/usb/core/config.c | 4 - drivers/usb/core/devio.c | 56 ++++--- drivers/usb/core/hub.c | 9 + drivers/usb/core/quirks.c | 3 drivers/usb/gadget/configfs.c | 1 drivers/usb/gadget/function/f_fs.c | 2 drivers/usb/gadget/legacy/inode.c | 4 - drivers/usb/host/ehci-dbg.c | 2 drivers/usb/host/xhci-mem.c | 22 ++- drivers/usb/musb/da8xx.c | 10 + drivers/usb/phy/phy-isp1301.c | 7 + drivers/usb/storage/uas-detect.h | 4 + drivers/usb/storage/unusual_devs.h | 7 + drivers/usb/storage/unusual_uas.h | 7 + drivers/usb/usbip/stub_tx.c | 7 + drivers/video/console/fbcon.c | 67 +++++---- drivers/video/fbdev/au1200fb.c | 7 + drivers/video/fbdev/controlfb.h | 2 drivers/video/fbdev/udlfb.c | 10 + drivers/virtio/virtio.c | 2 fs/afs/callback.c | 7 + fs/afs/cmservice.c | 3 fs/afs/file.c | 1 fs/afs/fsclient.c | 22 +-- fs/afs/inode.c | 11 + fs/afs/internal.h | 12 +- fs/afs/security.c | 7 + fs/afs/server.c | 6 - fs/afs/vlocation.c | 16 +- fs/afs/write.c | 32 ++++ fs/autofs4/waitq.c | 1 fs/btrfs/inode.c | 14 ++ fs/ext4/extents.c | 1 fs/ext4/inode.c | 4 + fs/ext4/namei.c | 4 + fs/ext4/super.c | 6 + fs/gfs2/file.c | 4 - fs/nfs/dir.c | 2 fs/nfs/nfs4client.c | 4 - fs/nfs/nfs4proc.c | 3 fs/nfs/nfs4state.c | 1 fs/nfsd/nfssvc.c | 30 ++-- fs/nfsd/vfs.c | 59 +++++--- fs/proc/proc_tty.c | 3 fs/udf/super.c | 2 fs/xfs/libxfs/xfs_bmap.c | 2 fs/xfs/libxfs/xfs_inode_buf.c | 8 + fs/xfs/xfs_buf.c | 1 fs/xfs/xfs_log_recover.c | 2 include/crypto/internal/hash.h | 8 + include/drm/drmP.h | 26 +++ include/linux/bitops.h | 11 + include/linux/buffer_head.h | 4 - include/linux/ceph/osdmap.h | 2 include/linux/genalloc.h | 3 include/linux/kvm_host.h | 4 - include/linux/log2.h | 13 -- include/linux/mlx4/device.h | 1 include/linux/mman.h | 3 include/linux/omap-gpmc.h | 5 - include/scsi/libsas.h | 2 include/uapi/linux/packet_diag.h | 2 kernel/audit.c | 10 + kernel/debug/kdb/kdb_io.c | 2 kernel/gcov/base.c | 12 ++ kernel/gcov/gcc_4_7.c | 6 + kernel/padata.c | 5 - kernel/sched/deadline.c | 8 + kernel/trace/trace.c | 29 +--- kernel/workqueue.c | 1 lib/asn1_decoder.c | 2 lib/dynamic_debug.c | 4 + lib/genalloc.c | 10 + net/ceph/messenger.c | 6 + net/ceph/osdmap.c | 1 net/core/dev.c | 1 net/core/skbuff.c | 30 ++-- net/core/sock.c | 10 + net/dccp/ccids/ccid2.c | 1 net/dccp/ipv4.c | 3 net/dccp/ipv6.c | 8 + net/dccp/minisocks.c | 1 net/ipv4/fib_frontend.c | 3 net/ipv4/route.c | 15 +- net/ipv4/tcp.c | 2 net/ipv4/tcp_input.c | 4 - net/ipv4/tcp_ipv4.c | 10 + net/ipv4/tcp_minisocks.c | 1 net/ipv4/tcp_timer.c | 6 + net/ipv6/addrconf.c | 3 net/ipv6/af_inet6.c | 10 + net/ipv6/ip6_fib.c | 2 net/ipv6/ip6_vti.c | 14 +- net/ipv6/sit.c | 1 net/ipv6/tcp_ipv6.c | 8 + net/irda/irqueue.c | 34 ++-- net/l2tp/l2tp_core.c | 2 net/l2tp/l2tp_ip.c | 2 net/l2tp/l2tp_netlink.c | 2 net/llc/llc_conn.c | 3 net/llc/llc_sap.c | 3 net/mac80211/mesh.c | 2 net/mpls/af_mpls.c | 1 net/packet/af_packet.c | 39 +++-- net/rds/rdma.c | 2 net/sched/act_api.c | 5 - net/sched/act_connmark.c | 3 net/sctp/debug.c | 2 net/sctp/socket.c | 32 +++- net/socket.c | 5 + net/sunrpc/sched.c | 3 net/tipc/server.c | 4 - net/unix/garbage.c | 17 +- net/xfrm/xfrm_policy.c | 11 + net/xfrm/xfrm_user.c | 9 + scripts/module-common.lds | 2 security/integrity/ima/ima_main.c | 4 + security/keys/keyctl.c | 4 - sound/core/pcm.c | 2 sound/core/seq/seq_timer.c | 2 sound/usb/mixer.c | 13 +- tools/hv/hv_kvp_daemon.c | 70 ++------- tools/include/linux/log2.h | 13 -- tools/perf/tests/attr.c | 2 tools/perf/util/symbol.c | 2 tools/testing/selftests/powerpc/harness.c | 6 + virt/kvm/eventfd.c | 3 virt/kvm/kvm_main.c | 40 ++++- 285 files changed, 1949 insertions(+), 1074 deletions(-)