kernel_optimize_test/drivers
Linus Torvalds ae7a835cc5 Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM updates from Gleb Natapov:
 "The highlights of the release are nested EPT and pv-ticketlocks
  support (hypervisor part, guest part, which is most of the code, goes
  through tip tree).  Apart of that there are many fixes for all arches"

Fix up semantic conflicts as discussed in the pull request thread..

* 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (88 commits)
  ARM: KVM: Add newlines to panic strings
  ARM: KVM: Work around older compiler bug
  ARM: KVM: Simplify tracepoint text
  ARM: KVM: Fix kvm_set_pte assignment
  ARM: KVM: vgic: Bump VGIC_NR_IRQS to 256
  ARM: KVM: Bugfix: vgic_bytemap_get_reg per cpu regs
  ARM: KVM: vgic: fix GICD_ICFGRn access
  ARM: KVM: vgic: simplify vgic_get_target_reg
  KVM: MMU: remove unused parameter
  KVM: PPC: Book3S PR: Rework kvmppc_mmu_book3s_64_xlate()
  KVM: PPC: Book3S PR: Make instruction fetch fallback work for system calls
  KVM: PPC: Book3S PR: Don't corrupt guest state when kernel uses VMX
  KVM: x86: update masterclock when kvmclock_offset is calculated (v2)
  KVM: PPC: Book3S: Fix compile error in XICS emulation
  KVM: PPC: Book3S PR: return appropriate error when allocation fails
  arch: powerpc: kvm: add signed type cast for comparation
  KVM: x86: add comments where MMIO does not return to the emulator
  KVM: vmx: count exits to userspace during invalid guest emulation
  KVM: rename __kvm_io_bus_sort_cmp to kvm_io_bus_cmp
  kvm: optimize away THP checks in kvm_is_mmio_pfn()
  ...
2013-09-04 18:15:06 -07:00
..
accessibility
acpi PTR_RET() is a weird name, and led to some confusing usage. We ended 2013-09-04 17:31:11 -07:00
amba
ata Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 2013-09-03 18:19:53 -07:00
atm
auxdisplay
base Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm 2013-09-04 18:15:06 -07:00
bcma
block Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
bluetooth
bus drivers/bus: arm-cci: avoid parsing DT for cpu device nodes 2013-08-21 10:29:53 +01:00
cdrom
char Features: 2013-09-04 17:45:39 -07:00
clk
clocksource Merge branch 'timers/clockevents-next' of git://git.linaro.org/people/dlezcano/clockevents into timers/core 2013-08-21 14:59:23 +02:00
connector
cpufreq ACPI and power management updates for 3.12-rc1 2013-09-03 15:59:39 -07:00
cpuidle cpuidle: coupled: fix race condition between pokes and safe state 2013-08-29 22:15:34 +02:00
crypto
dca
devfreq devfreq: convert devfreq_class to use dev_groups 2013-08-19 21:22:34 -07:00
dio
dma Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
edac amd64_edac: Fix incorrect wraparounds 2013-08-27 15:00:22 +02:00
eisa
extcon Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
firewire
firmware Big part of this is the addition of compression to the 2013-09-03 21:14:06 -07:00
fmc
gpio
gpu PTR_RET() is a weird name, and led to some confusing usage. We ended 2013-09-04 17:31:11 -07:00
hid Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
hsi
hv Drivers: hv: vmbus: Do not attempt to negoatiate a new version prematurely 2013-08-30 12:08:04 -07:00
hwmon New driver for HTU21D (humidity sensor) 2013-09-03 10:43:35 -07:00
hwspinlock
i2c
ide
idle
iio staging tree merge for 3.12-rc1 2013-09-03 11:37:57 -07:00
infiniband PTR_RET() is a weird name, and led to some confusing usage. We ended 2013-09-04 17:31:11 -07:00
input Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
iommu
ipack
irqchip irqchip: sirf: move from legacy mode to linear irqdomain 2013-08-29 09:48:32 -07:00
isdn Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
leds
lguest
macintosh
mailbox
md SCSI misc on 20130903 2013-09-03 15:48:06 -07:00
media PTR_RET() is a weird name, and led to some confusing usage. We ended 2013-09-04 17:31:11 -07:00
memory
memstick
message
mfd PCI changes for the v3.12 merge window: 2013-09-03 16:24:35 -07:00
misc Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
mmc
mtd
net PTR_RET() is a weird name, and led to some confusing usage. We ended 2013-09-04 17:31:11 -07:00
nfc
ntb
nubus
of ACPI and power management updates for 3.12-rc1 2013-09-03 15:59:39 -07:00
oprofile
parisc PCI changes for the v3.12 merge window: 2013-09-03 16:24:35 -07:00
parport drivers: parport: Kconfig: exclude h8300 for PARPORT_PC 2013-08-30 12:08:04 -07:00
pci PCI changes for the v3.12 merge window: 2013-09-03 16:24:35 -07:00
pcmcia
pinctrl PTR_RET() is a weird name, and led to some confusing usage. We ended 2013-09-04 17:31:11 -07:00
platform PTR_RET() is a weird name, and led to some confusing usage. We ended 2013-09-04 17:31:11 -07:00
pnp Merge branch 'pnp' 2013-08-27 01:41:35 +02:00
power
pps PPS: convert class code to use dev_groups 2013-08-19 21:22:34 -07:00
ps3
ptp
pwm pwm: pxa: Use module_platform_driver 2013-09-03 13:09:17 +02:00
rapidio
regulator PTR_RET() is a weird name, and led to some confusing usage. We ended 2013-09-04 17:31:11 -07:00
remoteproc
reset
rpmsg
rtc PTR_RET() is a weird name, and led to some confusing usage. We ended 2013-09-04 17:31:11 -07:00
s390 SCSI misc on 20130903 2013-09-03 15:48:06 -07:00
sbus
scsi Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 2013-09-03 18:19:53 -07:00
sfi
sh
sn
spi PTR_RET() is a weird name, and led to some confusing usage. We ended 2013-09-04 17:31:11 -07:00
ssb
staging TTY/Serial driver patches for 3.12-rc1 2013-09-03 11:38:36 -07:00
target target: Fix se_cmd->state_list leak regression during WRITE failure 2013-08-31 15:19:12 -07:00
tc
thermal
tty TTY/Serial driver patches for 3.12-rc1 2013-09-03 11:38:36 -07:00
uio Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
usb Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
uwb uwb: Staticize local symbols 2013-08-19 17:08:16 -07:00
vfio
vhost
video PTR_RET() is a weird name, and led to some confusing usage. We ended 2013-09-04 17:31:11 -07:00
virt
virtio
vlynq
vme vme: vme_ca91cx42.c: fix to pass correct device identity to free_irq() 2013-08-27 21:49:26 -07:00
w1 w1: slaves: w1_ds2781: convert to use w1_family_ops.groups 2013-08-22 11:05:44 -07:00
watchdog
xen Features: 2013-09-04 17:45:39 -07:00
zorro
Kconfig
Makefile