You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 18cb657ca1 Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen ... and branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm * 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm: xen: register xen pci notifier xen: initialize cpu masks for pv guests in xen_smp_init xen: add a missing #include to arch/x86/pci/xen.c xen: mask the MTRR feature from the cpuid xen: make hvc_xen console work for dom0. xen: add the direct mapping area for ISA bus access xen: Initialize xenbus for dom0. xen: use vcpu_ops to setup cpu masks xen: map a dummy page for local apic and ioapic in xen_set_fixmap xen: remap MSIs into pirqs when running as initial domain xen: remap GSIs as pirqs when running as initial domain xen: introduce XEN_DOM0 as a silent option xen: map MSIs into pirqs xen: support GSI -> pirq remapping in PV on HVM guests xen: add xen hvm acpi_register_gsi variant acpi: use indirect call to register gsi in different modes xen: implement xen_hvm_register_pirq xen: get the maximum number of pirqs from xen xen: support pirq != irq * 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (27 commits) X86/PCI: Remove the dependency on isapnp_disable. xen: Update Makefile with CONFIG_BLOCK dependency for biomerge.c MAINTAINERS: Add myself to the Xen Hypervisor Interface and remove Chris Wright. x86: xen: Sanitse irq handling (part two) swiotlb-xen: On x86-32 builts, select SWIOTLB instead of depending on it. MAINTAINERS: Add myself for Xen PCI and Xen SWIOTLB maintainer. xen/pci: Request ACS when Xen-SWIOTLB is activated. xen-pcifront: Xen PCI frontend driver. xenbus: prevent warnings on unhandled enumeration values xenbus: Xen paravirtualised PCI hotplug support. xen/x86/PCI: Add support for the Xen PCI subsystem x86: Introduce x86_msi_ops msi: Introduce default_[teardown|setup]_msi_irqs with fallback. x86/PCI: Export pci_walk_bus function. x86/PCI: make sure _PAGE_IOMAP it set on pci mappings x86/PCI: Clean up pci_cache_line_size xen: fix shared irq device passthrough xen: Provide a variant of xen_poll_irq with timeout. xen: Find an unbound irq number in reverse order (high to low). xen: statically initialize cpu_evtchn_mask_p ... Fix up trivial conflicts in drivers/pci/Makefile		14 years ago
..
aoe	drivers/block/aoe/aoeblk.c: ratelimit a warning printk	14 years ago
drbd	drivers/block/drbd/drbd_main.c: fix error path	14 years ago
paride	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	14 years ago
DAC960.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	14 years ago
DAC960.h	…
Kconfig	rbd: introduce rados block device (rbd), based on libceph	14 years ago
Makefile	rbd: introduce rados block device (rbd), based on libceph	14 years ago
amiflop.c	Merge branch 'for-2.6.37/drivers' of git://git.kernel.dk/linux-2.6-block	14 years ago
ataflop.c	Merge branch 'for-2.6.37/drivers' of git://git.kernel.dk/linux-2.6-block	14 years ago
brd.c	Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block	14 years ago
cciss.c	cciss: remove overlapping PCI IDs	14 years ago
cciss.h	…
cciss_cmd.h	…
cciss_scsi.c	…
cciss_scsi.h	…
cpqarray.c	…
cpqarray.h	…
cryptoloop.c	…
floppy.c	Merge branch 'for-2.6.37/drivers' of git://git.kernel.dk/linux-2.6-block	14 years ago
hd.c	…
ida_cmd.h	…
ida_ioctl.h	…
loop.c	loop: Properly clear sysfs in autoclear mode	14 years ago
mg_disk.c	…
nbd.c	…
osdblk.c	…
pktcdvd.c	Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block	14 years ago
ps3disk.c	Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block	14 years ago
ps3vram.c	…
rbd.c	rbd: passing wrong variable to bvec_kunmap_irq()	14 years ago
rbd_types.h	rbd: introduce rados block device (rbd), based on libceph	14 years ago
smart1,2.h	…
sunvdc.c	…
swim.c	…
swim3.c	…
swim_asm.S	…
sx8.c	…
ub.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	14 years ago
umem.c	…
umem.h	…
viodasd.c	…
virtio_blk.c	Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block	14 years ago
xd.c	…
xd.h	…
xen-blkfront.c	Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	14 years ago
xsysace.c	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	14 years ago
z2ram.c	drivers/block/z2ram.c: correct printing of sector_t	14 years ago