| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1428678089-16291-1-git-send-email-pbonzini@redhat.com>
Date: Fri, 10 Apr 2015 17:01:29 +0200
From: Paolo Bonzini <pbonzini@...hat.com>
To: torvalds@...ux-foundation.org
Cc: linux-kernel@...r.kernel.org, gleb@...nel.org, kvm@...r.kernel.org,
Ralf Baechle <ralf@...ux-mips.org>
Subject: [GIT PULL] First batch of KVM changes for 4.1
Linus,
The following changes since commit ae705930fca6322600690df9dc1c7d0516145a93:
arm/arm64: KVM: Keep elrsr/aisr in sync with software model (2015-03-14 13:42:07 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/for-linus
for you to fetch changes up to ca3f0874723fad81d0c701b63ae3a17a408d5f25:
KVM: use slowpath for cross page cached accesses (2015-04-10 16:04:45 +0200)
Note that this includes some MIPS patches that will also come through
Ralf Baechle's tree (CCed). As usual, PPC will be sent in a second
pull request. This time, no child is due during the merge window,
and hence the KVM/PPC pull request shall come normally from me.
Thanks,
Paolo
----------------------------------------------------------------
The most interesting bit here is irqfd/ioeventfd support for ARM and ARM64.
ARM/ARM64: fixes for live migration, irqfd and ioeventfd support (enabling
vhost, too), page aging
s390: interrupt handling rework, allowing to inject all local interrupts
via new ioctl and to get/set the full local irq state for migration
and introspection. New ioctls to access memory by virtual address,
and to get/set the guest storage keys. SIMD support.
MIPS: FPU and MIPS SIMD Architecture (MSA) support. Includes some patches
from Ralf Baechle's MIPS tree.
x86: bugfixes (notably for pvclock, the others are small) and cleanups.
Another small latency improvement for the TSC deadline timer.
----------------------------------------------------------------
Alex Bennée (2):
arm/arm64: KVM: export VCPU power state via MP_STATE ioctl
arm/arm64: KVM: add a common vgic_queue_irq_to_lr fn
Alexander Yarygin (5):
KVM: s390: Use the read_guest_abs() in guest debug functions
KVM: s390: Fix low-address protection for real addresses
KVM: s390: Guest's memory access functions get access registers
KVM: s390: Optimize paths where get_vcpu_asce() is invoked
KVM: s390: Add access register mode
Andre Przywara (10):
KVM: move iodev.h from virt/kvm/ to include/kvm
KVM: arm/arm64: remove now unneeded include directory from Makefile
KVM: x86: remove now unneeded include directory from Makefile
KVM: arm/arm64: rename struct kvm_mmio_range to vgic_io_range
KVM: arm/arm64: simplify vgic_find_range() and callers
KVM: arm/arm64: implement kvm_io_bus MMIO handling for the VGIC
KVM: arm/arm64: prepare GICv2 emulation to be handled by kvm_io_bus
KVM: arm/arm64: merge GICv3 RD_base and SGI_base register frames
KVM: arm/arm64: prepare GICv3 emulation to use kvm_io_bus MMIO handling
KVM: arm/arm64: rework MMIO abort handling to use KVM MMIO bus
Arseny Solokha (1):
kvm/ppc/mpic: drop unused IRQ_testbit
Bandan Das (1):
KVM: SVM: Fix confusing message if no exit handlers are installed
Christian Borntraeger (3):
KVM: make halt_poll_ns static
KVM: MAINTAINERS: add file arch/x86/kernel/kvm.c|kvmclock.c
KVM: s390: enable more features that need no hypervisor changes
Christoffer Dall (3):
arm/arm64: KVM: Kill CONFIG_KVM_ARM_{VGIC,TIMER}
arm/arm64: KVM: support for un-queuing active IRQs
arm/arm64: KVM: Fix migration race in the arch timer
David Hildenbrand (5):
KVM: s390: fix handling of write errors in the tpi handler
KVM: s390: reinjection of irqs can fail in the tpi handler
KVM: s390: fix instruction interception trace point
KVM: s390: store the breaking-event address on pgm interrupts
KVM: s390: cpu timer irq priority
David Kaplan (3):
KVM: SVM: use kvm_register_write()/read()
kvm: svm: make wbinvd faster
x86: svm: use cr_interception for SVM_EXIT_CR0_SEL_WRITE
Dominik Dingel (1):
KVM: s390: cleanup jump lables in kvm_arch_init_vm
Ekaterina Tumanova (2):
KVM: s390: Zero out current VMDB of STSI before including level3 data.
KVM: s390: introduce post handlers for STSI
Eric Auger (5):
KVM: arm/arm64: unset CONFIG_HAVE_KVM_IRQCHIP
KVM: introduce kvm_arch_intc_initialized and use it in irqfd
KVM: arm/arm64: implement kvm_arch_intc_initialized
KVM: arm/arm64: remove coarse grain dist locking at kvm_vgic_sync_hwstate
KVM: arm/arm64: add irqfd support
Eric Farman (5):
KVM: s390: Allocate and save/restore vector registers
KVM: s390: Vector exceptions
KVM: s390: Add new SIGP order to kernel counters
KVM: s390: Machine Check
KVM: s390: Enable vector support for capable guest
Eugene Korenevsky (4):
KVM: remove useless check of "ret" variable prior to returning the same value
KVM: x86: cache maxphyaddr CPUID leaf in struct kvm_vcpu
KVM: nVMX: checks for address bits beyond MAXPHYADDR on VM-entry
KVM: nVMX: remove unnecessary double caching of MAXPHYADDR
Geert Uytterhoeven (1):
KVM: s390: Spelling s/intance/instance/
James Hogan (24):
MIPS: lose_fpu(): Disable FPU when MSA enabled
Revert "MIPS: Don't assume 64-bit FP registers for context switch"
MIPS: MSA: Fix big-endian FPR_IDX implementation
Merge branch '4.1-fp' of git://git.linux-mips.org/pub/scm/ralf/upstream-sfr into kvm_mips_queue
MIPS: KVM: Handle MSA Disabled exceptions from guest
MIPS: Clear [MSA]FPE CSR.Cause after notify_die()
MIPS: KVM: Handle TRAP exceptions from guest kernel
MIPS: KVM: Implement PRid CP0 register access
MIPS: KVM: Sort kvm_mips_get_reg() registers
MIPS: KVM: Drop pr_info messages on init/exit
MIPS: KVM: Clean up register definitions a little
MIPS: KVM: Simplify default guest Config registers
MIPS: KVM: Add Config4/5 and writing of Config registers
MIPS: KVM: Add vcpu_get_regs/vcpu_set_regs callback
MIPS: KVM: Add base guest FPU support
MIPS: KVM: Emulate FPU bits in COP0 interface
MIPS: KVM: Add FP exception handling
MIPS: KVM: Expose FPU registers
MIPS: KVM: Wire up FPU capability
MIPS: KVM: Add base guest MSA support
MIPS: KVM: Emulate MSA bits in COP0 interface
MIPS: KVM: Add MSA exception handling
MIPS: KVM: Expose MSA registers
MIPS: KVM: Wire up MSA capability
Jan Kiszka (3):
KVM: x86: Fix re-execution of patched vmmcall
KVM: nVMX: Do not emulate #UD while in guest mode
KVM: nVMX: Add support for rdtscp
Jason J. Herne (1):
KVM: s390: Create ioctl for Getting/Setting guest storage keys
Jens Freimann (5):
KVM: s390: fix get_all_floating_irqs
KVM: s390: deliver floating interrupts in order of priority
KVM: s390: add ioctl to inject local interrupts
KVM: s390: refactor vcpu injection function
KVM: s390: migrate vcpu interrupt state
Joe Perches (1):
x86: Use bool function return values of true/false not 1/0
Joel Schopp (1):
kvm: x86: make kvm_emulate_* consistant
Kevin Mulvey (2):
KVM: white space formatting in kvm_main.c
KVM: fix checkpatch.pl errors in kvm/irqchip.c
Marc Zyngier (3):
arm/arm64: KVM: Allow handle_hva_to_gpa to return a value
arm/arm64: KVM: Implement Stage-2 page aging
arm/arm64: KVM: Optimize handling of Access Flag faults
Marcelo Tosatti (3):
Merge tag 'kvm-s390-next-20150306' of git://git.kernel.org/.../kvms390/linux into queue
x86: kvm: Revert "remove sched notifier for cross-cpu migrations"
Merge tag 'kvm-s390-next-20150318' of git://git.kernel.org/.../kvms390/linux into queue
Mark Rutland (1):
KVM: vgic: add virt-capable compatible strings
Michael Mueller (3):
KVM: s390: perform vcpu model setup in a function
KVM: s390: drop SIMD bit from kvm_s390_fac_list_mask
KVM: s390: represent SIMD cap in kvm facility
Nadav Amit (8):
KVM: x86: CMOV emulation on legacy mode is wrong
KVM: x86: POPA emulation may not clear bits [63:32]
KVM: x86: BSF and BSR emulation change register unnecassarily
KVM: x86: removing redundant eflags bits definitions
KVM: x86: Remove redundant definitions
KVM: x86: BSP in MSR_IA32_APICBASE is writable
KVM: x86: DR0-DR3 are not clear on reset
KVM: x86: Clear CR2 on VCPU reset
Nikolay Nikolaev (2):
KVM: Redesign kvm_io_bus_ API to pass VCPU structure to the callbacks.
KVM: arm/arm64: enable KVM_CAP_IOEVENTFD
Paolo Bonzini (8):
KVM: arm/arm64: prefer IS_ENABLED to a static variable
Merge tag 'kvm_mips_20150327' of git://git.kernel.org/.../jhogan/kvm-mips into kvm-next
Merge tag 'kvm-arm-fixes-4.0-rc5' of git://git.kernel.org/.../kvmarm/kvmarm into 'kvm-next'
Merge tag 'kvm-arm-for-4.1' of git://git.kernel.org/.../kvmarm/kvmarm into 'kvm-next'
Merge tag 'kvm-s390-next-20150331' of git://git.kernel.org/.../kvms390/linux into HEAD
KVM: x86: extract blocking logic from __vcpu_run
KVM: x86: optimize delivery of TSC deadline timer interrupt
KVM: remove kvm_read_hva and kvm_read_hva_atomic
Paul Burton (8):
MIPS: Push .set mips64r* into the functions needing it
MIPS: assume at as source/dest of MSA copy/insert instructions
MIPS: remove MSA macro recursion
MIPS: wrap cfcmsa & ctcmsa accesses for toolchains with MSA support
MIPS: clear MSACSR cause bits when handling MSA FP exception
MIPS: Ensure FCSR cause bits are clear after invoking FPU emulator
MIPS: prevent FP context set via ptrace being discarded
MIPS: disable FPU if the mode is unsupported
Petr Matousek (1):
kvm: x86: i8259: return initialized data on invalid-size read
Radim Krčmář (8):
KVM: x86: inline kvm_ioapic_handles_vector()
x86: vdso: fix pvclock races with task migration
KVM: vmx: pass error code with internal error #2
KVM: x86: use MDA for interrupt matching
KVM: x86: fix mixed APIC mode broadcast
KVM: x86: avoid logical_map when it is invalid
KVM: x86: simplify kvm_apic_map
KVM: use slowpath for cross page cached accesses
Takuya Yoshikawa (1):
KVM: Eliminate extra function calls in kvm_get_dirty_log_protect()
Thomas Huth (5):
KVM: s390: Nullify instruction for certain program exceptions
KVM: s390: Forward PSW to next instruction for addressing exceptions
KVM: s390: Use insn_length() to calculate length of instruction
KVM: Get rid of kvm_kvfree()
KVM: s390: Add MEMOP ioctls for reading/writing guest memory
Wanpeng Li (2):
kvm: x86: fix x86 eflags fixed bit
kvm: mmu: lazy collapse small sptes into large sptes
Wincy Van (1):
KVM: ioapic: Record edge-triggered interrupts delivery status
Xiubo Li (10):
KVM: Fix WARNINGs for 'sizeof(X)' instead of 'sizeof X' in kvm_main.c
KVM: Fix WARNING: labels should not be indented in kvm_main.c
KVM: Fix ERROR: do not initialise statics to 0 or NULL in kvm_main.c
KVM: EXPORT_SYMBOL should immediately follow its function
KVM: Missing blank line after declarations in kvm_main.c
KVM: no space before tabs in kvm_main.c
KVM: Fix indentation in kvm_main.c
KVM: Use pr_info/pr_err in kvm_main.c
KVM: x86: Avoid using plain integer as NULL pointer warning
KVM: x86: For the symbols used locally only should be static type
Yannick Guerrini (1):
KVM: s390: Fix trivial typo in comments
Documentation/CodeOfConflict | 27 +
Documentation/devicetree/bindings/i2c/i2c-imx.txt | 1 +
.../devicetree/bindings/net/apm-xgene-enet.txt | 5 +-
.../bindings/serial/snps-dw-apb-uart.txt | 16 +
Documentation/power/suspend-and-interrupts.txt | 22 +-
Documentation/virtual/kvm/api.txt | 335 +++++-
Documentation/virtual/kvm/devices/s390_flic.txt | 3 +
MAINTAINERS | 15 +-
Makefile | 2 +-
arch/arm/include/asm/kvm_arm.h | 1 +
arch/arm/include/asm/kvm_host.h | 15 +-
arch/arm/include/asm/kvm_mmio.h | 22 -
arch/arm/include/uapi/asm/kvm.h | 3 +
arch/arm/kernel/asm-offsets.c | 4 -
arch/arm/kvm/Kconfig | 30 +-
arch/arm/kvm/Makefile | 12 +-
arch/arm/kvm/arm.c | 45 +-
arch/arm/kvm/guest.c | 18 -
arch/arm/kvm/interrupts_head.S | 8 -
arch/arm/kvm/mmio.c | 64 +-
arch/arm/kvm/mmu.c | 134 ++-
arch/arm/kvm/trace.h | 48 +
arch/arm/mach-pxa/idp.c | 1 +
arch/arm/mach-pxa/lpd270.c | 2 +-
arch/arm/mach-sa1100/neponset.c | 4 +-
arch/arm/mach-sa1100/pleb.c | 2 +-
arch/arm64/boot/dts/apm/apm-storm.dtsi | 4 +-
arch/arm64/include/asm/esr.h | 1 +
arch/arm64/include/asm/kvm_arm.h | 1 +
arch/arm64/include/asm/kvm_host.h | 15 +-
arch/arm64/include/asm/kvm_mmio.h | 22 -
arch/arm64/include/uapi/asm/kvm.h | 3 +
arch/arm64/kvm/Kconfig | 18 +-
arch/arm64/kvm/Makefile | 20 +-
arch/arm64/mm/pageattr.c | 5 +-
arch/mips/include/asm/asmmacro-32.h | 128 +--
arch/mips/include/asm/asmmacro.h | 218 ++--
arch/mips/include/asm/fpu.h | 20 +-
arch/mips/include/asm/kdebug.h | 3 +-
arch/mips/include/asm/kvm_host.h | 125 ++-
arch/mips/include/asm/processor.h | 2 +-
arch/mips/include/uapi/asm/kvm.h | 164 +--
arch/mips/kernel/asm-offsets.c | 105 +-
arch/mips/kernel/genex.S | 15 +-
arch/mips/kernel/ptrace.c | 30 +-
arch/mips/kernel/r4k_fpu.S | 2 +-
arch/mips/kernel/traps.c | 33 +-
arch/mips/kvm/Makefile | 8 +-
arch/mips/kvm/emulate.c | 332 +++++-
arch/mips/kvm/fpu.S | 122 +++
arch/mips/kvm/locore.S | 38 +
arch/mips/kvm/mips.c | 472 ++++++++-
arch/mips/kvm/msa.S | 161 +++
arch/mips/kvm/stats.c | 4 +
arch/mips/kvm/tlb.c | 6 +
arch/mips/kvm/trap_emul.c | 199 +++-
arch/powerpc/kvm/mpic.c | 17 +-
arch/powerpc/kvm/powerpc.c | 4 +-
arch/s390/include/asm/kvm_host.h | 46 +-
arch/s390/include/asm/mmu_context.h | 2 +-
arch/s390/include/asm/page.h | 11 +-
arch/s390/include/uapi/asm/kvm.h | 4 +
arch/s390/include/uapi/asm/sie.h | 4 +-
arch/s390/kernel/asm-offsets.c | 1 +
arch/s390/kernel/jump_label.c | 12 +-
arch/s390/kernel/module.c | 1 +
arch/s390/kernel/processor.c | 2 +-
arch/s390/kvm/diag.c | 6 +-
arch/s390/kvm/gaccess.c | 296 +++++-
arch/s390/kvm/gaccess.h | 21 +-
arch/s390/kvm/guestdbg.c | 8 +-
arch/s390/kvm/intercept.c | 5 +-
arch/s390/kvm/interrupt.c | 1101 +++++++++++++-------
arch/s390/kvm/kvm-s390.c | 398 ++++++-
arch/s390/kvm/kvm-s390.h | 51 +-
arch/s390/kvm/priv.c | 144 ++-
arch/s390/kvm/sigp.c | 7 +-
arch/s390/pci/pci.c | 28 +-
arch/s390/pci/pci_mmio.c | 17 +-
arch/x86/Kconfig | 1 +
arch/x86/include/asm/kvm_host.h | 28 +-
arch/x86/include/asm/kvm_para.h | 2 +-
arch/x86/include/asm/pvclock.h | 1 +
arch/x86/include/asm/xsave.h | 28 +-
arch/x86/include/uapi/asm/vmx.h | 1 +
arch/x86/kernel/entry_64.S | 13 +-
arch/x86/kernel/pvclock.c | 44 +
arch/x86/kvm/Makefile | 2 +-
arch/x86/kvm/cpuid.c | 33 +-
arch/x86/kvm/cpuid.h | 8 +-
arch/x86/kvm/emulate.c | 193 ++--
arch/x86/kvm/i8254.c | 14 +-
arch/x86/kvm/i8254.h | 2 +-
arch/x86/kvm/i8259.c | 13 +-
arch/x86/kvm/ioapic.c | 22 +-
arch/x86/kvm/ioapic.h | 11 +-
arch/x86/kvm/irq.h | 2 +-
arch/x86/kvm/lapic.c | 147 +--
arch/x86/kvm/lapic.h | 17 +-
arch/x86/kvm/mmu.c | 73 ++
arch/x86/kvm/pmu.c | 2 +-
arch/x86/kvm/svm.c | 43 +-
arch/x86/kvm/vmx.c | 146 +--
arch/x86/kvm/x86.c | 157 ++-
arch/x86/pci/acpi.c | 11 +-
arch/x86/vdso/vclock_gettime.c | 34 +-
drivers/acpi/resource.c | 4 +-
drivers/acpi/video.c | 20 +-
drivers/android/binder.c | 10 +-
drivers/ata/sata_fsl.c | 2 +
drivers/base/power/domain.c | 24 +-
drivers/base/power/wakeup.c | 1 +
drivers/char/tpm/tpm-chip.c | 34 +-
drivers/char/tpm/tpm_ibmvtpm.c | 10 +-
drivers/char/tpm/tpm_ibmvtpm.h | 6 +-
drivers/clk/at91/pmc.c | 20 +-
drivers/clk/at91/pmc.h | 1 +
drivers/cpufreq/exynos-cpufreq.c | 21 +-
drivers/cpufreq/ppc-corenet-cpufreq.c | 2 +
drivers/cpuidle/cpuidle.c | 61 +-
drivers/dma/at_xdmac.c | 7 +-
drivers/dma/dw/core.c | 2 +-
drivers/dma/ioat/dma_v3.c | 4 +
drivers/dma/mmp_pdma.c | 10 +
drivers/dma/mmp_tdma.c | 31 +-
drivers/dma/qcom_bam_dma.c | 10 +-
drivers/dma/sh/shdmac.c | 15 +-
drivers/firmware/dmi_scan.c | 17 +-
drivers/firmware/efi/libstub/efi-stub-helper.c | 8 +-
drivers/gpu/drm/drm_mm.c | 152 +--
drivers/gpu/drm/i915/i915_debugfs.c | 4 +-
drivers/gpu/drm/i915/i915_drv.c | 30 +-
drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +-
drivers/gpu/drm/i915/intel_fifo_underrun.c | 18 +-
drivers/gpu/drm/imx/dw_hdmi-imx.c | 36 +-
drivers/gpu/drm/imx/imx-ldb.c | 28 +-
drivers/gpu/drm/imx/parallel-display.c | 5 +-
drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c | 5 +
drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 15 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 99 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 6 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 5 +
drivers/gpu/drm/msm/msm_atomic.c | 4 +-
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +-
drivers/gpu/drm/radeon/atombios_crtc.c | 3 +
drivers/gpu/drm/radeon/atombios_encoders.c | 30 +-
drivers/gpu/drm/radeon/cik.c | 3 +
drivers/gpu/drm/radeon/dce6_afmt.c | 68 +-
drivers/gpu/drm/radeon/evergreen.c | 3 +
drivers/gpu/drm/radeon/evergreen_hdmi.c | 59 +-
drivers/gpu/drm/radeon/r100.c | 4 +
drivers/gpu/drm/radeon/r600.c | 3 +
drivers/gpu/drm/radeon/r600_hdmi.c | 11 -
drivers/gpu/drm/radeon/radeon_audio.c | 50 +-
drivers/gpu/drm/radeon/radeon_cs.c | 4 +-
drivers/gpu/drm/radeon/rs600.c | 4 +
drivers/gpu/drm/radeon/si.c | 3 +
drivers/gpu/drm/radeon/sid.h | 4 +-
drivers/gpu/drm/ttm/ttm_bo.c | 2 +-
drivers/gpu/ipu-v3/ipu-di.c | 2 +
drivers/i2c/busses/i2c-designware-baytrail.c | 40 +-
drivers/iio/adc/mcp3422.c | 17 +-
drivers/iio/adc/qcom-spmi-iadc.c | 3 +-
drivers/iio/common/ssp_sensors/ssp_dev.c | 2 +
drivers/iio/dac/ad5686.c | 2 +-
drivers/iio/humidity/dht11.c | 69 +-
drivers/iio/humidity/si7020.c | 6 +-
drivers/iio/imu/adis16400_core.c | 3 +-
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 6 +-
drivers/iio/light/Kconfig | 2 +
drivers/iio/magnetometer/Kconfig | 2 +
drivers/input/keyboard/tc3589x-keypad.c | 6 +-
drivers/input/misc/mma8450.c | 1 +
drivers/input/mouse/alps.c | 4 +-
drivers/input/mouse/cyapa_gen3.c | 2 +-
drivers/input/mouse/cyapa_gen5.c | 4 +-
drivers/input/mouse/focaltech.c | 50 +-
drivers/input/mouse/psmouse-base.c | 14 +-
drivers/input/mouse/psmouse.h | 6 +
drivers/input/touchscreen/Kconfig | 1 +
drivers/misc/mei/init.c | 2 +
drivers/net/can/dev.c | 8 +
drivers/net/can/usb/kvaser_usb.c | 48 +-
drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 4 +
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 2 +-
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 4 +
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 8 +-
drivers/net/ethernet/broadcom/bgmac.c | 7 -
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +
drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 6 +-
drivers/net/ethernet/cadence/macb.c | 8 +-
drivers/net/ethernet/cadence/macb.h | 2 +-
drivers/net/ethernet/freescale/fec_main.c | 3 +-
drivers/net/ethernet/freescale/gianfar.c | 19 +-
drivers/net/ethernet/smsc/smc91x.c | 1 +
.../net/ethernet/stmicro/stmmac/stmmac_platform.c | 65 +-
drivers/net/team/team.c | 6 +-
drivers/net/xen-netback/interface.c | 3 +-
drivers/net/xen-netback/netback.c | 22 +-
drivers/pci/host/pci-versatile.c | 2 +-
drivers/regulator/core.c | 7 -
drivers/regulator/da9210-regulator.c | 9 +
drivers/regulator/rk808-regulator.c | 8 +
drivers/rtc/rtc-at91rm9200.c | 62 +-
drivers/rtc/rtc-at91sam9.c | 73 +-
drivers/s390/block/dcssblk.c | 2 +-
drivers/s390/block/scm_blk_cluster.c | 2 +-
drivers/spi/spi-atmel.c | 12 +-
drivers/spi/spi-dw-mid.c | 6 +
drivers/spi/spi-dw-pci.c | 4 +-
drivers/spi/spi-dw.c | 4 +-
drivers/spi/spi-img-spfi.c | 7 +
drivers/spi/spi-pl022.c | 2 +-
drivers/spi/spi-ti-qspi.c | 22 +
drivers/staging/comedi/drivers/adv_pci1710.c | 3 +-
drivers/staging/comedi/drivers/comedi_isadma.c | 5 +-
drivers/staging/comedi/drivers/vmk80xx.c | 71 --
drivers/staging/iio/adc/mxs-lradc.c | 207 ++--
drivers/staging/iio/resolver/ad2s1200.c | 3 +-
.../thermal/int340x_thermal/int340x_thermal_zone.c | 10 +-
drivers/thermal/samsung/exynos_tmu.c | 3 +-
drivers/thermal/thermal_core.c | 37 +-
drivers/tty/bfin_jtag_comm.c | 13 -
drivers/tty/serial/8250/8250_core.c | 11 +-
drivers/tty/serial/8250/8250_dw.c | 32 +
drivers/tty/serial/8250/8250_pci.c | 20 +-
drivers/tty/serial/atmel_serial.c | 49 +-
drivers/tty/serial/of_serial.c | 4 -
drivers/tty/serial/sprd_serial.c | 4 +-
drivers/tty/tty_io.c | 4 +-
drivers/tty/tty_ioctl.c | 16 +-
drivers/usb/class/cdc-acm.c | 2 +
drivers/usb/core/devio.c | 2 +
drivers/usb/dwc3/dwc3-omap.c | 30 +-
drivers/usb/gadget/configfs.c | 2 -
drivers/usb/gadget/function/f_hid.c | 2 +-
drivers/usb/gadget/function/f_phonet.c | 5 +-
drivers/usb/gadget/function/f_sourcesink.c | 4 +-
drivers/usb/gadget/function/f_uac2.c | 34 +-
drivers/usb/gadget/function/uvc_v4l2.c | 1 +
drivers/usb/gadget/function/uvc_video.c | 1 +
drivers/usb/gadget/legacy/g_ffs.c | 6 +-
drivers/usb/host/xhci-pci.c | 30 +
drivers/usb/host/xhci-plat.c | 19 +-
drivers/usb/host/xhci-ring.c | 12 +-
drivers/usb/host/xhci.c | 100 +-
drivers/usb/host/xhci.h | 11 +-
drivers/usb/isp1760/isp1760-hcd.c | 6 +-
drivers/usb/musb/musb_core.c | 10 +-
drivers/usb/musb/musb_dsps.c | 32 +-
drivers/usb/musb/musb_host.c | 2 +-
drivers/usb/musb/omap2430.c | 7 +-
drivers/usb/renesas_usbhs/Kconfig | 1 +
drivers/usb/serial/bus.c | 45 +-
drivers/usb/serial/ch341.c | 15 +-
drivers/usb/serial/console.c | 2 +
drivers/usb/serial/cp210x.c | 2 +
drivers/usb/serial/ftdi_sio.c | 19 +
drivers/usb/serial/ftdi_sio_ids.h | 23 +
drivers/usb/serial/generic.c | 5 +-
drivers/usb/serial/mxuport.c | 3 +-
drivers/usb/serial/pl2303.c | 18 +-
drivers/usb/serial/usb-serial.c | 21 +-
drivers/usb/storage/unusual_uas.h | 7 +
drivers/usb/storage/usb.c | 6 +
drivers/video/fbdev/amba-clcd.c | 3 +
drivers/video/fbdev/core/fbmon.c | 6 +-
drivers/video/fbdev/omap2/dss/display-sysfs.c | 179 ++--
drivers/watchdog/at91sam9_wdt.c | 3 +-
fs/btrfs/ctree.c | 8 +-
fs/btrfs/extent-tree.c | 16 +
fs/btrfs/file.c | 87 +-
fs/btrfs/inode.c | 1 -
fs/btrfs/ordered-data.c | 7 +-
fs/btrfs/send.c | 171 ++-
fs/btrfs/transaction.c | 3 -
fs/btrfs/tree-log.c | 2 +-
fs/btrfs/xattr.c | 8 +-
fs/ecryptfs/ecryptfs_kernel.h | 4 +-
fs/ecryptfs/file.c | 34 +-
fs/ecryptfs/keystore.c | 2 +-
fs/ecryptfs/main.c | 2 +-
fs/locks.c | 3 +-
fs/nfs/client.c | 2 +-
fs/nfs/delegation.c | 45 +-
fs/nfs/dir.c | 22 +-
fs/nfs/file.c | 11 +-
fs/nfs/inode.c | 111 +-
fs/nfs/internal.h | 1 +
fs/nfs/nfs3proc.c | 4 +-
fs/nfs/nfs3xdr.c | 5 +
fs/nfs/nfs4client.c | 9 +-
fs/nfs/nfs4proc.c | 31 +-
fs/nfs/nfs4session.h | 1 +
fs/nfs/nfs4state.c | 18 +-
fs/nfs/proc.c | 6 +-
fs/nfs/write.c | 30 +
include/drm/drm_mm.h | 52 +-
include/drm/ttm/ttm_bo_api.h | 2 +-
include/drm/ttm/ttm_bo_driver.h | 2 +-
include/kvm/arm_arch_timer.h | 31 +-
include/kvm/arm_vgic.h | 117 +--
{virt => include}/kvm/iodev.h | 28 +-
include/linux/cpuidle.h | 17 +-
include/linux/interrupt.h | 9 +-
include/linux/irqdesc.h | 1 +
include/linux/kvm_host.h | 32 +-
include/linux/nfs_fs.h | 5 +-
include/linux/sched.h | 8 +
include/linux/serial_core.h | 14 +-
include/linux/spi/spi.h | 2 +-
include/linux/usb/serial.h | 3 +-
include/linux/workqueue.h | 3 +-
include/net/netfilter/nf_tables.h | 22 +-
include/uapi/linux/kvm.h | 65 +-
include/uapi/linux/serial.h | 4 +
include/video/omapdss.h | 1 +
kernel/cpuset.c | 9 +-
kernel/irq/manage.c | 7 +-
kernel/irq/pm.c | 7 +-
kernel/livepatch/core.c | 3 +-
kernel/module.c | 2 +
kernel/printk/console_cmdline.h | 2 +-
kernel/printk/printk.c | 1 +
kernel/sched/core.c | 15 +
kernel/sched/idle.c | 54 +-
kernel/trace/ftrace.c | 40 +-
kernel/workqueue.c | 56 +-
lib/seq_buf.c | 4 +-
net/can/af_can.c | 3 +
net/ipv4/ip_fragment.c | 11 +-
net/ipv4/ip_sockglue.c | 33 +-
net/ipv4/ping.c | 12 +-
net/ipv4/tcp.c | 10 +-
net/ipv6/datagram.c | 39 +-
net/ipv6/ping.c | 5 +-
net/irda/ircomm/ircomm_tty.c | 4 +-
net/netfilter/ipvs/ip_vs_sync.c | 3 +
net/netfilter/nf_tables_api.c | 61 +-
net/netfilter/nft_compat.c | 14 +-
net/packet/af_packet.c | 22 +-
net/rxrpc/ar-error.c | 4 +-
net/sunrpc/cache.c | 2 +-
net/sunrpc/xprtrdma/rpc_rdma.c | 3 +-
net/sunrpc/xprtrdma/xprt_rdma.h | 2 +-
net/tipc/link.c | 7 +-
sound/drivers/opl3/opl3_midi.c | 2 +
sound/firewire/dice/dice-interface.h | 18 +-
sound/firewire/dice/dice-proc.c | 4 +-
sound/firewire/oxfw/oxfw-stream.c | 5 +-
sound/isa/msnd/msnd_pinnacle_mixer.c | 3 +-
sound/pci/hda/patch_realtek.c | 7 +
sound/soc/atmel/sam9g20_wm8731.c | 68 +-
sound/soc/cirrus/Kconfig | 2 +-
sound/soc/codecs/Kconfig | 2 +-
sound/soc/codecs/max98357a.c | 12 +-
sound/soc/codecs/rt5670.c | 7 +-
sound/soc/codecs/rt5677.c | 32 +-
sound/soc/codecs/sta32x.c | 6 +-
sound/soc/fsl/fsl_ssi.c | 11 +-
sound/soc/generic/simple-card.c | 5 +
sound/soc/intel/sst-atom-controls.h | 2 +-
sound/soc/intel/sst/sst.c | 10 +-
sound/soc/omap/omap-hdmi-audio.c | 3 +
sound/soc/omap/omap-mcbsp.c | 11 +
sound/soc/omap/omap-pcm.c | 2 +-
sound/soc/samsung/Kconfig | 10 +-
sound/soc/sh/rcar/core.c | 4 +-
sound/usb/line6/playback.c | 6 +-
virt/kvm/arm/arch_timer.c | 45 +-
virt/kvm/arm/vgic-v2-emul.c | 71 +-
virt/kvm/arm/vgic-v3-emul.c | 246 +++--
virt/kvm/arm/vgic.c | 479 ++++++---
virt/kvm/arm/vgic.h | 37 +-
virt/kvm/coalesced_mmio.c | 7 +-
virt/kvm/eventfd.c | 9 +-
virt/kvm/irqchip.c | 2 +-
virt/kvm/kvm_main.c | 148 ++-
378 files changed, 8320 insertions(+), 3641 deletions(-)
create mode 100644 Documentation/CodeOfConflict
create mode 100644 arch/mips/kvm/fpu.S
create mode 100644 arch/mips/kvm/msa.S
rename {virt => include}/kvm/iodev.h (66%)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists