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
..
byteorder
caif
can
dvb
hdlc
hsi
isdn
mmc
netfilter	netfilter: nf_queue: add NFQA_SKB_CSUM_NOTVERIFIED info flag	2013-06-30 18:15:48 +02:00
netfilter_arp
netfilter_bridge
netfilter_ipv4
netfilter_ipv6
nfsd
raid
spi
sunrpc
tc_act
tc_ematch
usb	USB: move the definition of USB_MAXCHILDREN	2013-07-16 15:33:02 -07:00
wimax
a.out.h
acct.h
adb.h
adfs_fs.h
affs_hardblocks.h
agpgart.h
aio_abi.h
apm_bios.h
arcfb.h
atalk.h
atm.h
atm_eni.h
atm_he.h
atm_idt77105.h
atm_nicstar.h
atm_tcp.h
atm_zatm.h
atmapi.h
atmarp.h
atmbr2684.h
atmclip.h
atmdev.h
atmioc.h
atmlec.h
atmmpc.h
atmppp.h
atmsap.h
atmsvc.h
audit.h	audit: Make testing for a valid loginuid explicit.	2013-05-07 22:27:15 -04:00
auto_fs.h
auto_fs4.h
auxvec.h
ax25.h
b1lli.h
baycom.h
bcm933xx_hcs.h	MIPS: BCM63XX: recognize Cable Modem firmware format	2013-07-01 15:10:53 +02:00
bfs_fs.h
binfmts.h
blkpg.h
blktrace_api.h
bpqether.h
bsg.h
btrfs.h	btrfs: device delete to get errors from the kernel	2013-06-14 11:29:53 -04:00
can.h
capability.h
capi.h
cciss_defs.h
cciss_ioctl.h
cdrom.h
cgroupstats.h
chio.h
cm4000_cs.h	Omnikey Cardman 4000: pull in ioctl.h in user header	2013-08-28 19:26:38 -07:00
cn_proc.h
coda.h
coda_psdev.h
coff.h
connector.h
const.h	linux/const.h: Add _BITUL() and _BITULL()	2013-06-25 15:50:04 -07:00
cramfs_fs.h
cuda.h
cyclades.h
cycx_cfm.h
dcbnl.h
dccp.h
dlm.h
dlm_device.h
dlm_netlink.h
dlm_plock.h
dlmconstants.h
dm-ioctl.h	dm: optimize use SRCU and RCU	2013-07-10 23:41:18 +01:00
dm-log-userspace.h
dn.h
dqblk_xfs.h
edd.h
efs_fs_sb.h
elf-em.h
elf-fdpic.h
elf.h
elfcore.h
errno.h
errqueue.h
ethtool.h	net: ethtool: disambiguate XCVR_* meaning	2013-05-27 22:42:50 -07:00
eventpoll.h
fadvise.h
falloc.h
fanotify.h
fb.h
fcntl.h
fd.h
fdreg.h
fib_rules.h
fiemap.h	ext4: add support for extent pre-caching	2013-08-16 22:05:14 -04:00
filter.h
firewire-cdev.h	firewire: fix libdc1394/FlyCap2 iso event regression	2013-07-27 20:24:36 +02:00
firewire-constants.h
flat.h
fs.h
fsl_hypervisor.h
fuse.h
futex.h
gameport.h
gen_stats.h	net_sched: add 64bit rate estimators	2013-06-11 02:51:03 -07:00
genetlink.h
gfs2_ondisk.h
gigaset_dev.h
hdlc.h
hdlcdrv.h
hdreg.h
hid.h
hiddev.h
hidraw.h
hpet.h
hw_breakpoint.h
hysdn_if.h
i2c-dev.h
i2c.h
i2o-dev.h
i8k.h
icmp.h
icmpv6.h
if.h
if_addr.h
if_addrlabel.h
if_alg.h
if_arcnet.h
if_arp.h	net: if_arp: add ARPHRD_NETLINK type	2013-06-24 16:39:05 -07:00
if_bonding.h
if_bridge.h
if_cablemodem.h	if_cablemodem.h: Add parenthesis around ioctl macros	2013-05-08 13:13:30 -07:00
if_eql.h
if_ether.h
if_fc.h
if_fddi.h
if_frad.h
if_hippi.h
if_infiniband.h
if_link.h	net/core: Add VF link state control	2013-06-13 17:51:04 -07:00
if_ltalk.h
if_packet.h
if_phonet.h
if_plip.h
if_ppp.h
if_pppol2tp.h
if_pppox.h	net: Swap ver and type in pppoe_hdr	2013-07-01 18:20:33 -07:00
if_slip.h
if_team.h
if_tun.h	tun: Report "persist" flag to userspace	2013-06-12 15:07:21 -07:00
if_tunnel.h
if_vlan.h
if_x25.h
igmp.h
in.h
in6.h
in_route.h
inet_diag.h
inotify.h
input.h	Input: make gamepad API keycodes more clear	2013-06-27 11:54:51 +02:00
ioctl.h
ip.h	ipv4: expose IPV4_DEVCONF	2013-08-22 20:30:15 -07:00
ip6_tunnel.h
ip_vs.h	ipvs: SH fallback and L4 hashing	2013-06-26 18:01:46 +09:00
ipc.h
ipmi.h
ipmi_msgdefs.h
ipsec.h
ipv6.h
ipv6_route.h
ipx.h
irda.h
irqnr.h
isdn.h
isdn_divertif.h
isdn_ppp.h
isdnif.h
iso_fs.h
ivtv.h
ivtvfb.h
ixjuser.h
jffs2.h
joystick.h
Kbuild	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2013-07-13 14:52:21 -07:00
kd.h
kdev_t.h
kernel-page-flags.h
kernel.h
kernelcapi.h
kexec.h
keyboard.h
keyctl.h
kvm.h	KVM: PPC: reserve a capability number for multitce support	2013-08-26 15:36:58 +03:00
kvm_para.h	kvm uapi: Add KICK_CPU and PV_UNHALT definition to uapi	2013-08-26 12:46:01 +03:00
l2tp.h
limits.h
llc.h
loop.h
lp.h
magic.h	hostfs: move HOSTFS_SUPER_MAGIC to <linux/magic.h>	2013-05-04 15:48:44 -04:00
major.h
map_to_7segment.h
matroxfb.h
mdio.h
media.h
mei.h
mempolicy.h
meye.h
mii.h
minix_fs.h
mman.h
mmtimer.h
module.h
mqueue.h
mroute.h
mroute6.h
msdos_fs.h	fatfs: add FAT_IOCTL_GET_VOLUME_ID	2013-07-09 10:33:25 -07:00
msg.h
mtio.h
n_r3964.h
nbd.h
ncp.h
ncp_fs.h
ncp_mount.h
ncp_no.h
neighbour.h
net.h
net_dropmon.h
net_tstamp.h
netconf.h
netdevice.h
netfilter.h
netfilter_arp.h
netfilter_bridge.h
netfilter_decnet.h
netfilter_ipv4.h
netfilter_ipv6.h
netlink.h
netlink_diag.h
netrom.h
nfc.h	NFC: netlink: Rename CMD_FW_UPLOAD to CMD_FW_DOWNLOAD	2013-07-31 01:19:43 +02:00
nfs.h
nfs2.h
nfs3.h
nfs4.h
nfs4_mount.h
nfs_fs.h
nfs_idmap.h
nfs_mount.h
nfsacl.h
nl80211.h	nl80211/cfg80211: add 5 and 10 MHz defines and wiphy flag	2013-06-18 16:06:50 +02:00
nubus.h
nvram.h
omap3isp.h
omapfb.h
oom.h
openvswitch.h	openvswitch: Add gre tunnel support.	2013-06-19 18:07:42 -07:00
packet_diag.h
param.h
parport.h
patchkey.h
pci.h
pci_regs.h	PCI: Add offsets of PCIe capability registers	2013-08-28 11:28:10 -06:00
perf_event.h	perf: Add a dummy software event to keep tracking	2013-09-02 14:58:19 -03:00
personality.h
pfkeyv2.h
pg.h
phantom.h
phonet.h
pkt_cls.h
pkt_sched.h	net_sched: restore "linklayer atm" handling	2013-08-15 01:43:08 -07:00
pktcdvd.h
pmu.h
poll.h
posix_types.h
ppdev.h
ppp-comp.h
ppp-ioctl.h
ppp_defs.h
pps.h
prctl.h
ptp_clock.h
ptrace.h	ptrace: add ability to get/set signal-blocked mask	2013-07-03 16:08:01 -07:00
qnx4_fs.h
qnxtypes.h
quota.h
radeonfb.h
random.h
raw.h
rds.h
reboot.h
reiserfs_fs.h
reiserfs_xattr.h
resource.h
rfkill.h
romfs_fs.h
rose.h
route.h
rtc.h
rtnetlink.h	tcp: introduce a per-route knob for quick ack	2013-06-19 23:06:51 -07:00
scc.h
sched.h
screen_info.h
sctp.h
sdla.h
seccomp.h
securebits.h
selinux_netlink.h
sem.h
serial.h
serial_core.h	serial:st-asc: Add ST ASC driver.	2013-07-26 16:08:02 -07:00
serial_reg.h	Revert "OMAP: UART: Keep the TX fifo full when possible"	2013-08-27 16:02:18 -07:00
serio.h
shm.h
signal.h
signalfd.h
snmp.h	net: rename busy poll MIB counter	2013-08-09 11:39:08 -07:00
sock_diag.h
socket.h
sockios.h
som.h
sonet.h
sonypi.h
sound.h
soundcard.h
stat.h
stddef.h
string.h
suspend_ioctls.h
swab.h
synclink.h
sysctl.h
sysinfo.h
taskstats.h
tcp.h
tcp_metrics.h
telephony.h
termios.h
time.h
times.h
timex.h
tiocl.h
tipc.h	tipc: update code comments to reflect new uapi header path	2013-06-17 15:53:00 -07:00
tipc_config.h	tipc: update code comments to reflect new uapi header path	2013-06-17 15:53:00 -07:00
toshiba.h
tty.h
tty_flags.h
types.h
udf_fs_i.h
udp.h
uhid.h
uinput.h
uio.h
ultrasound.h
un.h
unistd.h
unix_diag.h
usbdevice_fs.h
utime.h
utsname.h
uuid.h
uvcvideo.h
v4l2-common.h
v4l2-controls.h	[media] v4l2-controls.h: fix copy-and-paste error in comment	2013-06-28 15:07:16 -03:00
v4l2-dv-timings.h
v4l2-mediabus.h
v4l2-subdev.h
veth.h
vfio.h	vfio Updates for v3.11	2013-07-10 14:50:08 -07:00
vhost.h	tcm_vhost: header split up	2013-05-02 13:40:15 +03:00
videodev2.h	[media] v4l2-core: remove support for obsolete VIDIOC_DBG_G_CHIP_IDENT	2013-06-21 10:46:44 -03:00
virtio_9p.h
virtio_balloon.h
virtio_blk.h
virtio_config.h	virtio: VIRTIO_F_ANY_LAYOUT feature	2013-07-09 10:47:45 +09:30
virtio_console.h	Simple warning fix for module sections. If too late to pull, no big deal.	2013-07-03 13:09:06 -07:00
virtio_ids.h
virtio_net.h	virtio: don't expose u16 in userspace api	2013-05-05 16:58:01 -04:00
virtio_pci.h	virtio_pci: better macro exported in uapi	2013-05-20 12:08:09 +09:30
virtio_ring.h
virtio_rng.h
vm_sockets.h
vt.h
wait.h
wanrouter.h
watchdog.h
wimax.h
wireless.h
x25.h
xattr.h
xfrm.h