diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-05 22:12:34 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-05 22:12:34 +0100 |
| commit | c812a51d11bbe983f4c24e32b59b265705ddd3c2 (patch) | |
| tree | d454f518db51a4de700cf3dcd4c3c71ee7288b47 /drivers/net/cnic_if.h | |
| parent | Merge branch 'write_inode2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | KVM: x86: Add KVM_CAP_X86_ROBUST_SINGLESTEP (diff) | |
| download | linux-c812a51d11bbe983f4c24e32b59b265705ddd3c2.tar.xz linux-c812a51d11bbe983f4c24e32b59b265705ddd3c2.zip | |
Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (145 commits)
KVM: x86: Add KVM_CAP_X86_ROBUST_SINGLESTEP
KVM: VMX: Update instruction length on intercepted BP
KVM: Fix emulate_sys[call, enter, exit]()'s fault handling
KVM: Fix segment descriptor loading
KVM: Fix load_guest_segment_descriptor() to inject page fault
KVM: x86 emulator: Forbid modifying CS segment register by mov instruction
KVM: Convert kvm->requests_lock to raw_spinlock_t
KVM: Convert i8254/i8259 locks to raw_spinlocks
KVM: x86 emulator: disallow opcode 82 in 64-bit mode
KVM: x86 emulator: code style cleanup
KVM: Plan obsolescence of kernel allocated slots, paravirt mmu
KVM: x86 emulator: Add LOCK prefix validity checking
KVM: x86 emulator: Check CPL level during privilege instruction emulation
KVM: x86 emulator: Fix popf emulation
KVM: x86 emulator: Check IOPL level during io instruction emulation
KVM: x86 emulator: fix memory access during x86 emulation
KVM: x86 emulator: Add Virtual-8086 mode of emulation
KVM: x86 emulator: Add group9 instruction decoding
KVM: x86 emulator: Add group8 instruction decoding
KVM: do not store wqh in irqfd
...
Trivial conflicts in Documentation/feature-removal-schedule.txt
Diffstat (limited to 'drivers/net/cnic_if.h')
0 files changed, 0 insertions, 0 deletions