Merge tag 'v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994804AbdGCBI6nKSN0/[email protected]> |
Author: Ralf Baechle <[email protected]> Mon Jul 3 02:29:41 2017 +0200 Commit: a854c975b794772d337565dd359ca113b14368a7 Gitweb: https://git.linux-mips.org/g/ralf/linux/a854c975b794 Branch: master --- MAINTAINERS | 2 Makefile | 2 arch/arc/include/asm/processor.h | 2 arch/arm/Kconfig | 1 arch/arm/boot/compressed/efi-header.S | 3 - arch/arm/kernel/setup.c | 2 arch/arm/mm/mmu.c | 8 +- arch/blackfin/include/asm/processor.h | 5 - arch/c6x/include/asm/processor.h | 5 - arch/cris/arch-v10/kernel/process.c | 8 -- arch/cris/arch-v32/kernel/process.c | 8 -- arch/cris/include/asm/processor.h | 2 arch/frv/include/asm/processor.h | 5 - arch/frv/kernel/process.c | 9 -- arch/h8300/include/asm/processor.h | 4 - arch/h8300/kernel/process.c | 5 - arch/hexagon/include/asm/processor.h | 3 - arch/hexagon/kernel/process.c | 8 -- arch/ia64/include/asm/processor.h | 17 ---- arch/m32r/include/asm/processor.h | 2 arch/m32r/kernel/process.c | 8 -- arch/m68k/include/asm/processor.h | 2 arch/m68k/kernel/process.c | 14 --- arch/microblaze/include/asm/processor.h | 6 - arch/microblaze/kernel/process.c | 17 ---- arch/mips/kernel/entry.S | 3 + arch/mips/kernel/head.S | 2 arch/mips/kernel/pm-cps.c | 9 -- arch/mips/kernel/traps.c | 2 arch/mips/math-emu/dp_maddf.c | 5 + arch/mips/math-emu/sp_maddf.c | 5 + arch/mips/mm/dma-default.c | 23 ++++- arch/mn10300/include/asm/processor.h | 5 - arch/mn10300/kernel/process.c | 8 -- arch/nios2/include/asm/processor.h | 3 - arch/openrisc/include/asm/processor.h | 5 - arch/openrisc/kernel/process.c | 5 - arch/parisc/include/asm/processor.h | 5 - arch/parisc/kernel/process.c | 5 - arch/powerpc/include/asm/processor.h | 6 - arch/powerpc/include/asm/uaccess.h | 8 -- arch/s390/include/asm/processor.h | 5 - arch/s390/kernel/ipl.c | 7 -- arch/s390/kernel/process.c | 25 ------ arch/score/include/asm/processor.h | 1 arch/score/kernel/process.c | 5 - arch/sparc/include/asm/processor_32.h | 3 - arch/sparc/include/asm/processor_64.h | 2 arch/sparc/kernel/process_32.c | 8 -- arch/sparc/kernel/process_64.c | 19 ---- arch/tile/include/asm/processor.h | 7 -- arch/um/include/asm/processor-generic.h | 2 arch/um/kernel/um_arch.c | 6 - arch/x86/boot/compressed/kaslr.c | 3 - arch/x86/boot/compressed/misc.c | 6 + arch/x86/boot/compressed/misc.h | 2 arch/x86/events/intel/uncore.c | 2 arch/x86/include/asm/processor.h | 2 arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 4 + arch/x86/kernel/process.c | 11 --- arch/x86/kernel/tboot.c | 2 arch/x86/mm/init_64.c | 8 ++ arch/xtensa/include/asm/processor.h | 2 block/bio.c | 12 ++- drivers/gpio/gpiolib-acpi.c | 2 drivers/gpio/gpiolib.c | 3 - drivers/gpu/drm/etnaviv/etnaviv_gem.h | 3 - drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 drivers/gpu/drm/i915/i915_debugfs.c | 6 + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 17 +++- drivers/gpu/drm/i915/i915_vma.c | 5 + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 1 drivers/iommu/amd_iommu.c | 6 - drivers/md/dm-raid.c | 17 +++- drivers/md/dm-thin.c | 26 +++--- drivers/misc/cxl/context.c | 6 + drivers/misc/cxl/cxl.h | 18 +--- drivers/misc/cxl/fault.c | 23 ++++- drivers/misc/cxl/main.c | 17 +++- drivers/misc/cxl/native.c | 29 ++++--- drivers/misc/cxl/pci.c | 11 +-- drivers/net/arcnet/arcnet.c | 7 +- drivers/net/arcnet/capmode.c | 2 drivers/net/arcnet/com20020-pci.c | 6 + drivers/net/arcnet/com20020.c | 2 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 61 ++++++++++++-- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 6 + drivers/net/ethernet/freescale/fman/Kconfig | 1 .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 3 + drivers/net/ethernet/rocker/rocker_ofdpa.c | 2 drivers/net/ethernet/sfc/ef10.c | 15 ++-- drivers/net/ethernet/ti/cpsw-common.c | 2 drivers/net/hyperv/netvsc_drv.c | 4 - drivers/net/macvlan.c | 85 +++++++++++++++++--- drivers/net/phy/dp83640.c | 2 drivers/net/phy/micrel.c | 2 drivers/net/usb/ax88179_178a.c | 16 ++++ drivers/net/veth.c | 4 - drivers/net/virtio_net.c | 1 drivers/net/xen-netback/common.h | 1 drivers/net/xen-netback/interface.c | 6 + drivers/net/xen-netback/netback.c | 6 + drivers/nvme/host/pci.c | 3 - drivers/pinctrl/pinctrl-rockchip.c | 44 +--------- fs/block_dev.c | 5 + fs/nfs/callback_xdr.c | 1 fs/nfs/dir.c | 51 ++++++------ fs/nfs/nfs4proc.c | 5 + fs/nfs/nfs4state.c | 2 fs/overlayfs/copy_up.c | 33 ++++---- include/linux/bio.h | 1 include/linux/hashtable.h | 1 include/linux/moduleparam.h | 2 include/net/xfrm.h | 7 -- include/uapi/linux/a.out.h | 26 ------ kernel/bpf/verifier.c | 5 + kernel/trace/ftrace.c | 3 - kernel/trace/trace.c | 3 + kernel/trace/trace_functions.c | 12 +++ kernel/trace/trace_kprobe.c | 14 +-- kernel/trace/trace_stack.c | 6 + net/core/dev.c | 30 +++++-- net/ipv4/ip_output.c | 3 - net/ipv4/tcp.c | 2 net/ipv6/addrconf.c | 5 + net/ipv6/datagram.c | 8 ++ net/ipv6/esp6_offload.c | 25 ++++++ net/ipv6/ip6_output.c | 2 net/ipv6/route.c | 6 + net/ipv6/sit.c | 2 net/ipv6/udp.c | 3 - net/ipv6/xfrm6_input.c | 2 net/key/af_key.c | 19 ++++ net/sched/sch_api.c | 3 - net/xfrm/Makefile | 3 - net/xfrm/xfrm_device.c | 2 net/xfrm/xfrm_policy.c | 4 - net/xfrm/xfrm_user.c | 1 sound/pci/hda/hda_codec.h | 2 sound/pci/hda/hda_controller.c | 8 +- sound/pci/hda/hda_generic.c | 1 tools/perf/util/machine.c | 10 +- tools/testing/selftests/bpf/test_verifier.c | 66 ++++++++++++++++ 144 files changed, 637 insertions(+), 613 deletions(-)