Merge tag 'v4.1.42' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.1-stable
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994840AbdIVIT6Wh9lV/[email protected]> |
Author: Ralf Baechle <[email protected]> Wed Sep 20 23:43:14 2017 +0200 Commit: 0ec5d789fe520fdb513879848079e727800831c4 Gitweb: https://git.linux-mips.org/g/ralf/linux/0ec5d789fe52 Branch: linux-4.1-stable --- Documentation/kernel-parameters.txt | 7 + Makefile | 4 - arch/arc/mm/mmap.c | 2 arch/arm/configs/ezx_defconfig | 4 - arch/arm/configs/imote2_defconfig | 4 - arch/arm/kvm/init.S | 5 - arch/arm/kvm/mmu.c | 3 arch/arm/mm/mmap.c | 4 - arch/arm64/include/asm/asm-uaccess.h | 13 ++ arch/arm64/kernel/entry.S | 6 + arch/frv/mm/elf-fdpic.c | 2 arch/mips/kernel/branch.c | 4 - arch/mips/mm/mmap.c | 2 arch/mn10300/include/asm/switch_to.h | 2 arch/parisc/kernel/sys_parisc.c | 15 +- arch/powerpc/include/asm/topology.h | 14 ++ arch/powerpc/kernel/setup_64.c | 4 - arch/powerpc/mm/slice.c | 2 arch/powerpc/platforms/pseries/hotplug-memory.c | 2 arch/s390/mm/mmap.c | 4 - arch/sh/mm/mmap.c | 4 - arch/sparc/Kconfig | 4 - arch/sparc/include/asm/mmu_64.h | 2 arch/sparc/include/asm/mmu_context_64.h | 32 +--- arch/sparc/include/asm/pgtable_32.h | 4 - arch/sparc/include/asm/pil.h | 1 arch/sparc/include/asm/setup.h | 2 arch/sparc/include/asm/vio.h | 1 arch/sparc/kernel/irq_64.c | 17 ++ arch/sparc/kernel/kernel.h | 1 arch/sparc/kernel/smp_64.c | 31 ---- arch/sparc/kernel/sys_sparc_64.c | 4 - arch/sparc/kernel/traps_64.c | 4 - arch/sparc/kernel/tsb.S | 11 + arch/sparc/kernel/ttable_64.S | 2 arch/sparc/kernel/vio.c | 68 ++++++++- arch/sparc/mm/hugetlbpage.c | 2 arch/sparc/mm/init_32.c | 2 arch/sparc/mm/init_64.c | 86 +++++++---- arch/sparc/mm/tsb.c | 7 + arch/sparc/mm/ultra.S | 5 - arch/tile/mm/hugetlbpage.c | 2 arch/x86/kernel/kvm.c | 2 arch/x86/kernel/sys_x86_64.c | 4 - arch/x86/kvm/cpuid.c | 20 +-- arch/x86/kvm/mmu.c | 7 + arch/x86/kvm/mmu.h | 1 arch/x86/kvm/x86.c | 3 arch/x86/mm/hugetlbpage.c | 2 arch/x86/mm/numa_32.c | 1 arch/xtensa/include/asm/irq.h | 3 arch/xtensa/kernel/irq.c | 5 - arch/xtensa/kernel/syscall.c | 2 .../platforms/xtfpga/include/platform/hardware.h | 6 + arch/xtensa/platforms/xtfpga/setup.c | 10 + block/partitions/msdos.c | 2 crypto/gcm.c | 6 - drivers/base/power/runtime.c | 11 + drivers/char/mem.c | 2 drivers/gpu/drm/ast/ast_drv.h | 1 drivers/gpu/drm/ast/ast_main.c | 157 +++++++++++--------- drivers/gpu/drm/ast/ast_post.c | 18 ++ drivers/gpu/drm/nouveau/nouveau_display.c | 3 drivers/gpu/drm/nouveau/nouveau_drm.c | 5 + drivers/gpu/drm/nouveau/nouveau_fence.h | 1 drivers/gpu/drm/nouveau/nv84_fence.c | 6 + drivers/gpu/drm/radeon/ci_dpm.c | 6 + drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 drivers/iio/proximity/as3935.c | 10 + drivers/irqchip/irq-xtensa-mx.c | 2 drivers/irqchip/irq-xtensa-pic.c | 2 drivers/media/usb/pvrusb2/pvrusb2-eeprom.c | 13 +- drivers/media/v4l2-core/videobuf2-core.c | 2 drivers/mfd/omap-usb-tll.c | 2 drivers/misc/c2port/c2port-duramar2150.c | 4 - drivers/misc/cxl/file.c | 7 - drivers/net/can/usb/gs_usb.c | 2 drivers/net/ethernet/adaptec/starfire.c | 45 +++++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 + drivers/net/ethernet/emulex/benet/be_main.c | 4 - drivers/net/ethernet/ethoc.c | 3 drivers/net/ethernet/mellanox/mlx4/catas.c | 2 drivers/net/ethernet/mellanox/mlx4/intf.c | 12 ++ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 1 drivers/net/ethernet/xilinx/xilinx_emaclite.c | 126 +++++++++------- drivers/net/hamradio/mkiss.c | 4 - drivers/net/usb/qmi_wwan.c | 2 drivers/net/usb/r8152.c | 3 drivers/net/usb/sierra_net.c | 111 +++++++++----- drivers/net/virtio_net.c | 1 drivers/parport/parport_gsc.c | 8 + drivers/pci/pci.c | 3 drivers/s390/net/qeth_core.h | 4 + drivers/s390/net/qeth_core_main.c | 21 ++- drivers/s390/net/qeth_core_sys.c | 24 ++- drivers/s390/net/qeth_l2.h | 2 drivers/s390/net/qeth_l2_main.c | 26 +++ drivers/s390/net/qeth_l2_sys.c | 8 + drivers/s390/net/qeth_l3_main.c | 6 + drivers/scsi/qla2xxx/qla_os.c | 8 + drivers/staging/lustre/lustre/lov/lov_pack.c | 9 - drivers/staging/rtl8188eu/core/rtw_ap.c | 2 drivers/tty/serial/efm32-uart.c | 11 + drivers/usb/chipidea/debug.c | 3 drivers/usb/chipidea/udc.c | 8 + drivers/usb/core/hcd.c | 1 drivers/usb/core/hub.c | 8 + drivers/usb/dwc3/dwc3-exynos.c | 4 - drivers/usb/gadget/function/f_mass_storage.c | 13 +- drivers/usb/gadget/legacy/inode.c | 5 - drivers/usb/gadget/udc/dummy_hcd.c | 19 +- drivers/usb/gadget/udc/net2280.c | 9 - drivers/usb/host/r8a66597-hcd.c | 6 + drivers/usb/host/xhci-pci.c | 3 fs/btrfs/extent-tree.c | 1 fs/btrfs/inode.c | 4 - fs/configfs/symlink.c | 3 fs/ext4/file.c | 50 ++---- fs/ext4/inode.c | 5 - fs/fscache/cookie.c | 5 + fs/fscache/object.c | 6 + fs/hugetlbfs/inode.c | 2 fs/nfsd/nfs4proc.c | 13 +- fs/proc/base.c | 2 fs/proc/task_mmu.c | 4 - fs/romfs/super.c | 23 +++ fs/ufs/super.c | 23 +++ fs/ufs/util.h | 10 + fs/xfs/libxfs/xfs_bmap.c | 7 + fs/xfs/libxfs/xfs_btree.c | 2 fs/xfs/xfs_bmap_util.c | 2 fs/xfs/xfs_buf.c | 24 +++ fs/xfs/xfs_buf.h | 1 fs/xfs/xfs_dir2_readdir.c | 15 +- fs/xfs/xfs_icache.c | 58 ++++++- fs/xfs/xfs_icache.h | 8 + fs/xfs/xfs_inode.h | 4 - fs/xfs/xfs_ioctl.c | 5 - fs/xfs/xfs_itable.c | 2 fs/xfs/xfs_log.c | 2 fs/xfs/xfs_mount.h | 1 fs/xfs/xfs_qm.c | 7 - fs/xfs/xfs_qm_syscalls.c | 3 fs/xfs/xfs_super.c | 8 + include/linux/cgroup.h | 20 +++ include/linux/if_vlan.h | 19 +- include/linux/log2.h | 13 ++ include/linux/mm.h | 53 +++---- include/linux/pci.h | 5 + include/linux/ptrace.h | 7 + include/net/ipv6.h | 1 include/uapi/linux/usb/ch11.h | 3 kernel/cpuset.c | 4 - kernel/events/core.c | 21 +++ kernel/irq/manage.c | 4 - kernel/ptrace.c | 20 ++- kernel/time/alarmtimer.c | 8 + lib/test_user_copy.c | 20 ++- mm/gup.c | 5 - mm/kasan/report.c | 3 mm/memory-failure.c | 13 +- mm/memory.c | 38 ----- mm/mmap.c | 156 ++++++++++++-------- mm/swap_cgroup.c | 3 net/core/ethtool.c | 9 + net/core/sock.c | 15 +- net/ipv4/af_inet.c | 2 net/ipv4/arp.c | 12 +- net/ipv4/inet_connection_sock.c | 2 net/ipv4/tcp.c | 7 + net/ipv4/tcp_cong.c | 1 net/ipv4/tcp_input.c | 11 + net/ipv6/addrconf.c | 10 + net/ipv6/datagram.c | 14 +- net/ipv6/ip6_offload.c | 9 + net/ipv6/ip6_output.c | 23 ++- net/ipv6/output_core.c | 14 +- net/ipv6/ping.c | 2 net/ipv6/raw.c | 2 net/ipv6/tcp_ipv6.c | 11 + net/ipv6/udp.c | 4 + net/ipv6/udp_offload.c | 6 + net/ipv6/xfrm6_mode_ro.c | 2 net/ipv6/xfrm6_mode_transport.c | 2 net/mac80211/cfg.c | 2 net/mac80211/ibss.c | 6 + net/mac80211/rx.c | 6 + net/mac80211/wpa.c | 9 + net/sctp/input.c | 16 +- net/sctp/ipv6.c | 3 net/sctp/socket.c | 6 + net/tipc/server.c | 13 +- security/keys/key.c | 5 - sound/core/timer.c | 7 + sound/soc/soc-core.c | 5 - 196 files changed, 1386 insertions(+), 822 deletions(-)