Merge branch 'upstream/xen' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

* 'upstream/xen' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: (23 commits)
  xen/panic: use xen_reboot and fix smp_send_stop
  Xen: register panic notifier to take crashes of xen guests on panic
  xen: support large numbers of CPUs with vcpu info placement
  xen: drop xen_sched_clock in favour of using plain wallclock time
  pvops: do not notify callers from register_xenstore_notifier
  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.
  implement O_NONBLOCK for /proc/xen/xenbus
  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.
  ...

diff --combined Documentation/kernel-parameters.txt
index d9239d5f3ad38ee2aca01e1c6cf25f4c1a6c82a5,2f32da74f5b1c9cf6830fce7e24b3dfc692c93e2..ef8b11cec6e94c365df8bd3bddbc12026e2cd7ea
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -93,7 -93,6 +93,7 @@@ parameter is applicable
                        Documentation/scsi/.
        SECURITY Different security models are enabled.
        SELINUX SELinux support is enabled.
 +      APPARMOR AppArmor support is enabled.
        SERIAL  Serial support is enabled.
        SH      SuperH architecture is enabled.
        SMP     The kernel is an SMP kernel.
@@@ -116,6 -115,7 +116,7 @@@
                        More X86-64 boot options can be found in
                        Documentation/x86/x86_64/boot-options.txt .
        X86     Either 32bit or 64bit x86 (same as X86-32+X86-64)
+       XEN     Xen support is enabled
  
  In addition, the following text indicates that the option:
  
@@@ -1598,7 -1598,8 +1599,7 @@@ and is between 256 and 4096 characters
                        [NETFILTER] Enable connection tracking flow accounting
                        0 to disable accounting
                        1 to enable accounting
 -                      Default value depends on CONFIG_NF_CT_ACCT that is
 -                      going to be removed in 2.6.29.
 +                      Default value is 0.
  
        nfsaddrs=       [NFS]
                        See Documentation/filesystems/nfs/nfsroot.txt.
@@@ -2312,13 -2313,6 +2313,13 @@@
                        If enabled at boot time, /selinux/disable can be used
                        later to disable prior to initial policy load.
  
 +      apparmor=       [APPARMOR] Disable or enable AppArmor at boot time
 +                      Format: { "0" | "1" }
 +                      See security/apparmor/Kconfig help text
 +                      0 -- disable.
 +                      1 -- enable.
 +                      Default value is set via kernel config option.
 +
        serialnumber    [BUGS=X86-32]
  
        shapers=        [NET]
@@@ -2886,6 -2880,16 +2887,16 @@@
        xd=             [HW,XT] Original XT pre-IDE (RLL encoded) disks.
        xd_geo=         See header of drivers/block/xd.c.
  
+       xen_emul_unplug=                [HW,X86,XEN]
+                       Unplug Xen emulated devices
+                       Format: [unplug0,][unplug1]
+                       ide-disks -- unplug primary master IDE devices
+                       aux-ide-disks -- unplug non-primary-master IDE devices
+                       nics -- unplug network devices
+                       all -- unplug all emulated devices (NICs and IDE disks)
+                       ignore -- continue loading the Xen platform PCI driver even
+                               if the version check failed
+ 
        xirc2ps_cs=     [NET,PCMCIA]
                        Format:
                        <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

diff --combined include/linux/pci_ids.h
index 33145408f04508e2b10f451ccaa9bdff48486366,cca2526f28d7e5fc0b27b412fb983c925ea9b483..40c804d484ca54cf2856c35713e6639ffc11c6f2
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -1494,9 -1494,6 +1494,9 @@@
  #define PCI_DEVICE_ID_SBE_WANXL100    0x0301
  #define PCI_DEVICE_ID_SBE_WANXL200    0x0302
  #define PCI_DEVICE_ID_SBE_WANXL400    0x0104
 +#define PCI_SUBDEVICE_ID_SBE_T3E3     0x0009
 +#define PCI_SUBDEVICE_ID_SBE_2T3E3_P0 0x0901
 +#define PCI_SUBDEVICE_ID_SBE_2T3E3_P1 0x0902
  
  #define PCI_VENDOR_ID_TOSHIBA         0x1179
  #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1       0x0101
@@@ -2057,6 -2054,7 +2057,6 @@@
  #define PCI_DEVICE_ID_NX2_57711E      0x1650
  #define PCI_DEVICE_ID_TIGON3_5705     0x1653
  #define PCI_DEVICE_ID_TIGON3_5705_2   0x1654
 -#define PCI_DEVICE_ID_TIGON3_5720     0x1658
  #define PCI_DEVICE_ID_TIGON3_5721     0x1659
  #define PCI_DEVICE_ID_TIGON3_5722     0x165a
  #define PCI_DEVICE_ID_TIGON3_5723     0x165b
@@@ -2070,11 -2068,13 +2070,11 @@@
  #define PCI_DEVICE_ID_TIGON3_5754M    0x1672
  #define PCI_DEVICE_ID_TIGON3_5755M    0x1673
  #define PCI_DEVICE_ID_TIGON3_5756     0x1674
 -#define PCI_DEVICE_ID_TIGON3_5750     0x1676
  #define PCI_DEVICE_ID_TIGON3_5751     0x1677
  #define PCI_DEVICE_ID_TIGON3_5715     0x1678
  #define PCI_DEVICE_ID_TIGON3_5715S    0x1679
  #define PCI_DEVICE_ID_TIGON3_5754     0x167a
  #define PCI_DEVICE_ID_TIGON3_5755     0x167b
 -#define PCI_DEVICE_ID_TIGON3_5750M    0x167c
  #define PCI_DEVICE_ID_TIGON3_5751M    0x167d
  #define PCI_DEVICE_ID_TIGON3_5751F    0x167e
  #define PCI_DEVICE_ID_TIGON3_5787F    0x167f
@@@ -2264,7 -2264,6 +2264,7 @@@
  #define PCI_DEVICE_ID_TDI_EHCI          0x0101
  
  #define PCI_VENDOR_ID_FREESCALE               0x1957
 +#define PCI_DEVICE_ID_MPC8308         0xc006
  #define PCI_DEVICE_ID_MPC8315E                0x00b4
  #define PCI_DEVICE_ID_MPC8315         0x00b5
  #define PCI_DEVICE_ID_MPC8314E                0x00b6
@@@ -2773,3 -2772,6 +2773,6 @@@
  #define PCI_DEVICE_ID_RME_DIGI32      0x9896
  #define PCI_DEVICE_ID_RME_DIGI32_PRO  0x9897
  #define PCI_DEVICE_ID_RME_DIGI32_8    0x9898
+ 
+ #define PCI_VENDOR_ID_XEN             0x5853
+ #define PCI_DEVICE_ID_XEN_PLATFORM    0x0001