Jeremy Fitzhardinge ca50a5f390
Merge branch 'upstream/pvhvm' into upstream/xen ...
* upstream/pvhvm:
Introduce CONFIG_XEN_PVHVM compile option
blkfront: do not create a PV cdrom device if xen_hvm_guest
support multiple .discard.* sections to avoid section type conflicts
xen/pvhvm: fix build problem when !CONFIG_XEN
xenfs: enable for HVM domains too
x86: Call HVMOP_pagetable_dying on exit_mmap.
x86: Unplug emulated disks and nics.
x86: Use xen_vcpuop_clockevent, xen_clocksource and xen wallclock.
xen: Fix find_unbound_irq in presence of ioapic irqs.
xen: Add suspend/resume support for PV on HVM guests.
xen: Xen PCI platform device driver.
x86/xen: event channels delivery on HVM.
x86: early PV on HVM features initialization.
xen: Add support for HVM hypercalls.
Conflicts:
arch/x86/xen/enlighten.c
arch/x86/xen/time.c
2010-08-04 14:49:16 -07:00
2010-07-24 23:26:22 -04:00
2010-07-16 16:49:41 -07:00
2010-08-04 14:49:16 -07:00
2010-04-29 16:53:17 -07:00
2010-06-01 10:20:15 +02:00
2010-06-01 10:20:15 +02:00
2010-04-20 14:38:28 -07:00
2010-04-07 14:36:30 +02:00
2010-03-02 10:28:38 +01:00
2009-06-12 22:27:03 +09:30
2009-08-26 21:29:58 +02:00
2010-02-28 11:00:55 -08:00
2010-03-30 22:02:32 +09:00
2010-05-27 09:12:48 -07:00
2010-03-30 22:02:32 +09:00
2010-04-07 11:51:17 +02:00
2009-07-19 18:27:51 +02:00
2010-01-13 10:09:08 +01:00
2010-03-10 14:26:40 +01:00
2010-03-26 11:33:55 +01:00
2010-04-08 19:03:28 +02:00
2010-06-10 11:02:34 -04:00
2010-05-20 21:04:31 -05:00
2010-07-15 17:10:02 +02:00
2009-08-03 13:34:25 -07:00
2010-02-07 17:47:51 +01:00
2010-07-22 16:45:59 -07:00
2010-08-04 14:49:16 -07:00
2010-02-27 10:06:10 +01:00
2010-03-29 18:55:33 +02:00
2010-03-29 18:55:33 +02:00
2010-01-05 09:17:33 +09:00
2010-02-09 11:13:56 +01:00
2010-07-23 12:53:00 +02:00
2010-05-01 04:32:10 +02:00
2009-10-01 08:42:24 +02:00
2010-05-10 10:48:55 -07:00
2010-03-02 10:28:38 +01:00
2010-07-20 15:27:33 -07:00
2010-03-03 11:25:58 +01:00
2009-12-09 16:54:08 -08:00
2009-11-02 15:56:34 +01:00
2009-11-02 15:56:34 +01:00
2009-12-14 23:55:33 +01:00
2010-05-03 13:39:29 -07:00
2010-03-30 22:02:32 +09:00
2010-03-30 22:02:32 +09:00
2010-07-28 19:10:30 -05:00
2010-07-18 15:05:34 -07:00
2009-09-10 18:10:50 +03:00
2010-05-19 11:41:05 +03:00
2010-03-30 22:02:32 +09:00
2009-12-08 13:27:33 -08:00
2010-03-30 22:02:32 +09:00
2010-03-26 11:33:55 +01:00
2010-03-30 22:02:32 +09:00
2010-01-23 06:21:59 +01:00
2010-05-25 15:08:26 -07:00
2010-03-11 13:49:06 +01:00
2010-02-10 17:47:17 -08:00
2010-03-30 22:02:32 +09:00
2010-06-09 13:34:06 -07:00
2010-07-07 17:05:06 -07:00
2010-05-27 09:12:48 -07:00
2010-02-25 19:26:23 -08:00
2009-12-14 23:55:32 +01:00
2010-02-27 14:41:35 -08:00
2010-06-30 22:41:42 -07:00
2010-03-30 22:02:32 +09:00
2010-04-13 13:24:54 +02:00
2010-03-30 22:02:32 +09:00
2010-05-27 09:12:52 -07:00
2010-05-18 08:58:16 -07:00
2010-05-18 08:58:16 -07:00
2010-05-18 08:58:16 -07:00
2010-05-01 04:32:07 +02:00
2010-05-19 11:41:05 +03:00
2010-07-15 17:10:02 +02:00
2009-12-15 08:53:28 -08:00
2010-06-20 09:24:13 +02:00
2009-09-18 14:05:47 -07:00
2010-07-21 09:25:42 -07:00
2010-05-24 13:33:14 -07:00
2010-06-09 13:34:06 -07:00
2009-12-09 16:28:59 -08:00
2010-03-30 22:02:32 +09:00
2010-06-02 09:38:53 +02:00
2009-12-17 09:56:19 +01:00
2010-03-26 11:33:57 +01:00
2010-03-12 15:52:32 -08:00
2010-03-12 15:52:32 -08:00
2010-03-12 15:52:32 -08:00
2010-05-21 17:16:21 -07:00
2010-02-16 18:21:32 +01:00
2010-05-18 09:46:35 -07:00
2009-09-20 20:23:37 +02:00
2009-10-12 18:06:48 +02:00
2009-12-11 09:28:22 +01:00
2010-06-30 16:16:20 +02:00
2009-12-14 23:55:32 +01:00
2010-03-08 16:55:37 +01:00
2010-05-18 09:46:35 -07:00
2010-02-07 17:47:51 +01:00
2010-03-30 22:02:32 +09:00
2010-02-22 16:25:18 -08:00
2009-12-09 16:29:23 -08:00
2010-03-30 22:02:32 +09:00
2010-03-08 16:55:37 +01:00
2010-06-01 08:55:52 -07:00
2010-03-01 12:35:40 -03:00
2010-07-07 17:05:06 -07:00
2010-04-28 17:25:47 -07:00
2010-05-10 10:48:55 -07:00
ca50a5f390