Merge tag 'v4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23993417AbdHGIA2Q3p8y/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Aug 4 16:07:20 2017 +0200 Commit: fa7ce610a3dd94684fca3e620b4eb544a6985a8b Gitweb: https://git.linux-mips.org/g/ralf/linux/fa7ce610a3dd Branch: master --- .../devicetree/bindings/net/brcm,amac.txt | 1 .../devicetree/bindings/net/brcm,bgmac-nsp.txt | 24 .../devicetree/bindings/nvmem/rockchip-efuse.txt | 2 .../devicetree/bindings/ptp/brcm,ptp-dte.txt | 15 .../devicetree/bindings/serial/fsl-imx-uart.txt | 2 MAINTAINERS | 5120 ++++++++++---------- Makefile | 2 arch/alpha/include/uapi/asm/ioctls.h | 2 arch/arm/include/asm/bug.h | 2 arch/arm/include/asm/cacheflush.h | 2 arch/arm64/include/asm/bug.h | 2 arch/blackfin/include/asm/bug.h | 4 arch/mips/include/uapi/asm/ioctls.h | 2 arch/mn10300/include/asm/bug.h | 2 arch/parisc/include/asm/bug.h | 6 arch/parisc/include/uapi/asm/ioctls.h | 2 arch/powerpc/include/asm/book3s/64/hash.h | 1 arch/powerpc/include/asm/book3s/64/pgtable.h | 1 arch/powerpc/include/asm/book3s/64/radix.h | 1 arch/powerpc/include/asm/bug.h | 8 arch/powerpc/include/asm/pgtable.h | 7 arch/powerpc/include/uapi/asm/ioctls.h | 2 arch/powerpc/kernel/exceptions-64s.S | 28 arch/powerpc/kernel/idle_book3s.S | 15 arch/powerpc/mm/mem.c | 1 arch/powerpc/mm/pgtable-hash64.c | 44 arch/powerpc/mm/pgtable-radix.c | 28 arch/powerpc/mm/pgtable_64.c | 8 arch/powerpc/platforms/powernv/opal.c | 2 arch/s390/include/asm/bug.h | 4 arch/sh/include/asm/bug.h | 4 arch/sh/include/uapi/asm/ioctls.h | 2 arch/sparc/include/uapi/asm/ioctls.h | 2 arch/x86/Kconfig.debug | 1 arch/x86/boot/Makefile | 5 arch/x86/configs/i386_defconfig | 3 arch/x86/configs/x86_64_defconfig | 3 arch/x86/events/core.c | 4 arch/x86/events/intel/core.c | 164 + arch/x86/events/intel/cstate.c | 26 arch/x86/events/intel/ds.c | 22 arch/x86/events/intel/lbr.c | 4 arch/x86/events/perf_event.h | 2 arch/x86/include/asm/bug.h | 4 arch/x86/include/asm/io.h | 4 arch/x86/include/asm/kprobes.h | 8 arch/x86/include/asm/mmu_context.h | 2 arch/x86/include/asm/paravirt_types.h | 16 arch/x86/include/asm/processor.h | 2 arch/x86/kernel/acpi/boot.c | 8 arch/x86/kernel/apic/io_apic.c | 2 arch/x86/kernel/cpu/amd.c | 1 arch/x86/kernel/devicetree.c | 3 arch/x86/kvm/Kconfig | 2 arch/x86/kvm/hyperv.c | 7 arch/x86/kvm/vmx.c | 46 arch/x86/kvm/x86.c | 4 arch/x86/math-emu/Makefile | 4 arch/x86/math-emu/fpu_emu.h | 2 arch/x86/math-emu/reg_compare.c | 16 .../intel-mid/device_libs/platform_max7315.c | 6 arch/x86/platform/uv/tlb_uv.c | 29 arch/x86/xen/smp_pv.c | 3 arch/x86/xen/time.c | 1 arch/xtensa/include/uapi/asm/ioctls.h | 2 block/bfq-iosched.c | 3 block/bfq-iosched.h | 2 block/bfq-wf2q.c | 2 drivers/acpi/nfit/core.c | 10 drivers/android/binder.c | 17 drivers/atm/zatm.c | 2 drivers/base/power/domain.c | 8 drivers/block/nbd.c | 2 drivers/clocksource/timer-of.c | 12 drivers/cpufreq/intel_pstate.c | 21 drivers/dax/device-dax.h | 2 drivers/dax/device.c | 33 drivers/dax/pmem.c | 12 drivers/dma-buf/dma-fence.c | 17 drivers/dma-buf/sync_debug.c | 2 drivers/dma-buf/sync_file.c | 8 drivers/fsi/fsi-core.c | 7 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 3 drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 7 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 1 drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 3 drivers/gpu/drm/drm_dp_mst_topology.c | 41 drivers/gpu/drm/imx/ipuv3-plane.c | 2 drivers/gpu/drm/imx/parallel-display.c | 2 drivers/gpu/drm/radeon/radeon_kfd.c | 1 drivers/gpu/drm/vc4/vc4_crtc.c | 66 drivers/hid/hid-logitech-hidpp.c | 3 drivers/hid/hid-multitouch.c | 16 drivers/hv/channel.c | 2 drivers/hwmon/applesmc.c | 13 drivers/ide/ide-timings.c | 18 drivers/infiniband/core/cma.c | 2 drivers/infiniband/core/uverbs_cmd.c | 13 drivers/infiniband/hw/bnxt_re/bnxt_re.h | 9 drivers/infiniband/hw/bnxt_re/ib_verbs.c | 119 drivers/infiniband/hw/bnxt_re/ib_verbs.h | 3 drivers/infiniband/hw/bnxt_re/main.c | 1 drivers/infiniband/hw/bnxt_re/qplib_fp.c | 29 drivers/infiniband/hw/bnxt_re/qplib_fp.h | 1 drivers/infiniband/hw/bnxt_re/qplib_sp.c | 16 drivers/infiniband/hw/bnxt_re/qplib_sp.h | 3 drivers/infiniband/hw/cxgb3/iwch_provider.c | 9 drivers/infiniband/hw/cxgb4/cq.c | 1 drivers/infiniband/hw/cxgb4/qp.c | 2 drivers/infiniband/hw/i40iw/i40iw.h | 1 drivers/infiniband/hw/i40iw/i40iw_cm.c | 5 drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 2 drivers/infiniband/hw/i40iw/i40iw_main.c | 60 drivers/infiniband/hw/i40iw/i40iw_puda.c | 5 drivers/infiniband/hw/i40iw/i40iw_utils.c | 60 drivers/infiniband/hw/i40iw/i40iw_verbs.c | 19 drivers/infiniband/hw/i40iw/i40iw_verbs.h | 2 drivers/infiniband/hw/mlx4/cm.c | 4 drivers/infiniband/hw/mlx5/mr.c | 2 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 drivers/infiniband/hw/qedr/verbs.c | 16 drivers/infiniband/sw/rdmavt/qp.c | 4 drivers/infiniband/sw/rxe/rxe_resp.c | 3 drivers/infiniband/sw/rxe/rxe_verbs.c | 3 drivers/infiniband/ulp/ipoib/ipoib_main.c | 1 drivers/infiniband/ulp/iser/iser_initiator.c | 6 drivers/irqchip/irq-digicolor.c | 2 drivers/irqchip/irq-gic-realview.c | 2 drivers/irqchip/irq-mips-cpu.c | 2 drivers/irqchip/irq-mips-gic.c | 2 drivers/isdn/divert/isdn_divert.c | 25 drivers/isdn/hardware/avm/c4.c | 2 drivers/isdn/hardware/eicon/divasmain.c | 2 drivers/isdn/hardware/mISDN/avmfritz.c | 2 drivers/isdn/hardware/mISDN/hfcmulti.c | 2 drivers/isdn/hardware/mISDN/hfcpci.c | 2 drivers/isdn/hardware/mISDN/netjet.c | 2 drivers/isdn/hardware/mISDN/w6692.c | 2 drivers/isdn/hisax/config.c | 2 drivers/isdn/hisax/hfc4s8s_l1.c | 2 drivers/isdn/hisax/hisax_fcpcipnp.c | 2 drivers/mux/Kconfig | 19 drivers/mux/mux-core.c | 2 drivers/net/bonding/bond_main.c | 2 drivers/net/dsa/b53/b53_common.c | 1 drivers/net/dsa/mv88e6xxx/chip.c | 1 drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 22 drivers/net/ethernet/broadcom/bgmac-platform.c | 21 drivers/net/ethernet/broadcom/bgmac.c | 70 drivers/net/ethernet/broadcom/bgmac.h | 1 .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 7 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 299 + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 2 drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 2 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c | 3 drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 2 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 3 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 58 drivers/net/ethernet/mellanox/mlx4/alloc.c | 8 drivers/net/ethernet/qualcomm/emac/emac.c | 10 drivers/net/ethernet/sgi/ioc3-eth.c | 14 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 drivers/net/ethernet/sun/niu.c | 4 drivers/net/ethernet/tehuti/tehuti.c | 2 drivers/net/ethernet/ti/cpsw.c | 49 drivers/net/phy/mdio-mux.c | 4 drivers/net/ppp/ppp_generic.c | 30 drivers/net/usb/cdc_ncm.c | 28 drivers/net/usb/huawei_cdc_ncm.c | 6 drivers/net/usb/smsc95xx.c | 1 drivers/net/vmxnet3/vmxnet3_int.h | 2 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 drivers/nvdimm/core.c | 7 drivers/nvme/host/core.c | 2 drivers/nvme/host/pci.c | 43 drivers/nvme/target/admin-cmd.c | 16 drivers/nvme/target/configfs.c | 30 drivers/nvme/target/core.c | 5 drivers/nvme/target/fc.c | 8 drivers/nvme/target/nvmet.h | 2 drivers/nvmem/rockchip-efuse.c | 2 drivers/spmi/spmi-pmic-arb.c | 17 drivers/spmi/spmi.c | 12 drivers/staging/Kconfig | 2 drivers/staging/Makefile | 1 drivers/staging/comedi/drivers/ni_mio_common.c | 3 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 19 drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 drivers/staging/sm750fb/ddk750_chip.c | 2 drivers/staging/sm750fb/sm750.c | 24 drivers/staging/speakup/main.c | 2 drivers/staging/speakup/spk_priv.h | 2 drivers/staging/speakup/spk_ttyio.c | 22 drivers/staging/vboxvideo/Kconfig | 12 drivers/staging/vboxvideo/Makefile | 7 drivers/staging/vboxvideo/TODO | 9 drivers/staging/vboxvideo/hgsmi_base.c | 246 + drivers/staging/vboxvideo/hgsmi_ch_setup.h | 66 drivers/staging/vboxvideo/hgsmi_channels.h | 53 drivers/staging/vboxvideo/hgsmi_defs.h | 92 drivers/staging/vboxvideo/modesetting.c | 142 + drivers/staging/vboxvideo/vbox_drv.c | 286 + drivers/staging/vboxvideo/vbox_drv.h | 296 + drivers/staging/vboxvideo/vbox_err.h | 50 drivers/staging/vboxvideo/vbox_fb.c | 412 ++ drivers/staging/vboxvideo/vbox_hgsmi.c | 115 drivers/staging/vboxvideo/vbox_irq.c | 197 + drivers/staging/vboxvideo/vbox_main.c | 534 ++ drivers/staging/vboxvideo/vbox_mode.c | 877 +++ drivers/staging/vboxvideo/vbox_prime.c | 74 drivers/staging/vboxvideo/vbox_ttm.c | 472 ++ drivers/staging/vboxvideo/vboxvideo.h | 491 ++ drivers/staging/vboxvideo/vboxvideo_guest.h | 95 drivers/staging/vboxvideo/vboxvideo_vbe.h | 84 drivers/staging/vboxvideo/vbva_base.c | 233 + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 10 drivers/thunderbolt/switch.c | 3 drivers/tty/pty.c | 85 drivers/tty/serial/fsl_lpuart.c | 24 drivers/tty/serial/imx.c | 27 drivers/tty/serial/sh-sci.c | 12 drivers/tty/serial/st-asc.c | 1 drivers/usb/class/cdc-acm.c | 3 drivers/usb/dwc2/gadget.c | 3 drivers/usb/dwc3/core.c | 6 drivers/usb/dwc3/dwc3-omap.c | 18 drivers/usb/dwc3/gadget.c | 8 drivers/usb/gadget/function/f_mass_storage.c | 2 drivers/usb/gadget/function/f_uac1.c | 20 drivers/usb/gadget/function/f_uac2.c | 25 drivers/usb/gadget/udc/Kconfig | 5 drivers/usb/gadget/udc/renesas_usb3.c | 14 drivers/usb/gadget/udc/snps_udc_plat.c | 6 drivers/usb/host/pci-quirks.c | 54 drivers/usb/host/pci-quirks.h | 2 drivers/usb/host/xhci-hub.c | 14 drivers/usb/host/xhci-pci.c | 6 drivers/usb/host/xhci-ring.c | 11 drivers/usb/host/xhci.c | 10 drivers/usb/host/xhci.h | 1 drivers/usb/renesas_usbhs/common.c | 4 drivers/usb/renesas_usbhs/mod_gadget.c | 31 drivers/usb/storage/isd200.c | 5 drivers/usb/typec/ucsi/ucsi.h | 1 drivers/w1/masters/omap_hdq.c | 3 drivers/w1/w1.c | 4 drivers/xen/balloon.c | 3 drivers/xen/grant-table.c | 9 drivers/xen/xen-balloon.c | 22 fs/ceph/dir.c | 5 fs/ext2/acl.c | 43 fs/f2fs/acl.c | 2 fs/f2fs/checkpoint.c | 10 fs/f2fs/file.c | 5 fs/f2fs/sysfs.c | 1 fs/hfsplus/posix_acl.c | 30 fs/isofs/inode.c | 8 fs/mount.h | 4 fs/namei.c | 2 fs/nfs/client.c | 1 fs/nfs/dir.c | 47 fs/nfs/filelayout/filelayout.c | 13 fs/nfs/flexfilelayout/flexfilelayout.c | 4 fs/nfs/mount_clnt.c | 2 fs/nfs/nfs3proc.c | 11 fs/nfs/pnfs_nfs.c | 24 fs/overlayfs/dir.c | 22 fs/overlayfs/inode.c | 32 fs/overlayfs/namei.c | 41 fs/overlayfs/overlayfs.h | 10 fs/overlayfs/readdir.c | 5 fs/overlayfs/super.c | 13 fs/overlayfs/util.c | 7 fs/proc/internal.h | 6 fs/reiserfs/xattr_acl.c | 17 include/linux/binfmts.h | 4 include/linux/bpf-cgroup.h | 2 include/linux/bpf_verifier.h | 1 include/linux/cdev.h | 2 include/linux/ceph/ceph_features.h | 8 include/linux/compiler-gcc.h | 13 include/linux/compiler.h | 5 include/linux/cred.h | 4 include/linux/dcache.h | 2 include/linux/dma-fence.h | 2 include/linux/fs.h | 17 include/linux/fs_struct.h | 2 include/linux/ftrace.h | 6 include/linux/ipc.h | 2 include/linux/ipc_namespace.h | 2 include/linux/jhash.h | 29 include/linux/key-type.h | 4 include/linux/kmod.h | 2 include/linux/kobject.h | 2 include/linux/llist.h | 21 include/linux/lsm_hooks.h | 4 include/linux/mm_types.h | 4 include/linux/module.h | 4 include/linux/mount.h | 2 include/linux/msg.h | 2 include/linux/netfilter.h | 9 include/linux/nfs_fs.h | 2 include/linux/nvme.h | 14 include/linux/path.h | 2 include/linux/pid_namespace.h | 2 include/linux/proc_ns.h | 2 include/linux/sched.h | 16 include/linux/sched/signal.h | 2 include/linux/sem.h | 2 include/linux/shm.h | 2 include/linux/sysctl.h | 2 include/linux/trace_events.h | 2 include/linux/tty.h | 2 include/linux/tty_driver.h | 4 include/linux/usb/audio-v2.h | 14 include/linux/usb/cdc_ncm.h | 1 include/linux/user_namespace.h | 2 include/linux/utsname.h | 2 include/net/af_unix.h | 2 include/net/neighbour.h | 2 include/net/net_namespace.h | 2 include/net/netlink.h | 4 include/net/sctp/sctp.h | 4 include/net/sock.h | 2 include/rdma/ib_addr.h | 6 include/rdma/rdmavt_qp.h | 14 include/uapi/asm-generic/ioctls.h | 2 include/uapi/linux/usb/audio.h | 6 include/xen/balloon.h | 8 kernel/audit.c | 1 kernel/bpf/verifier.c | 108 kernel/events/core.c | 33 kernel/futex.c | 4 kernel/irq/chip.c | 10 kernel/irq/internals.h | 10 kernel/irq/pm.c | 2 kernel/locking/rtmutex.c | 1 kernel/sched/cputime.c | 6 kernel/sched/deadline.c | 14 kernel/trace/ftrace.c | 41 kernel/trace/ring_buffer.c | 10 kernel/trace/trace.c | 1 kernel/trace/trace.h | 6 net/bridge/br_device.c | 3 net/bridge/br_input.c | 3 net/ceph/messenger.c | 6 net/ceph/osd_client.c | 5 net/ceph/osdmap.c | 31 net/core/dev_ioctl.c | 3 net/core/fib_rules.c | 3 net/core/filter.c | 2 net/core/netpoll.c | 2 net/core/rtnetlink.c | 4 net/dccp/input.c | 2 net/ipv4/fib_frontend.c | 9 net/ipv4/ip_output.c | 8 net/ipv4/netfilter/nf_tables_arp.c | 3 net/ipv4/syncookies.c | 1 net/ipv4/tcp_bbr.c | 49 net/ipv4/udp.c | 13 net/ipv6/output_core.c | 8 net/ipv6/syncookies.c | 1 net/netfilter/core.c | 147 - net/netfilter/nf_conntrack_expect.c | 2 net/netfilter/nf_nat_core.c | 17 net/netfilter/nfnetlink.c | 6 net/openvswitch/conntrack.c | 51 net/packet/af_packet.c | 6 net/rds/send.c | 6 net/sched/act_api.c | 4 net/sctp/sm_make_chunk.c | 4 net/sunrpc/xprtsock.c | 2 scripts/parse-maintainers.pl | 77 security/keys/internal.h | 2 tools/lib/bpf/bpf.c | 4 tools/lib/bpf/bpf.h | 2 tools/perf/ui/browser.c | 2 tools/perf/util/evsel.c | 8 tools/perf/util/machine.c | 2 tools/testing/selftests/bpf/test_align.c | 2 tools/testing/selftests/bpf/test_verifier.c | 480 ++ 385 files changed, 10571 insertions(+), 4062 deletions(-)