lguest:fix-mismerge.patch
# Rusty Russell's patch queue, based on v2.6.24-5749-g8af03e7

# These patches go into the for-linus git branch, and the mm tree.
# MM_PATCHES_START
## for-linus
# module patches

# lguest patches
## for-linus end

# Other acked patches
misc:skb_partial_csum_set.patch

# virtio: ABI/API changes
virtio:simplify-config-mechanism.patch
virtio:explicit-callback-disable.patch
virtio:config_changed.patch
virtio:64-bit-fix.patch
virtio:vring-kick-when-empty.patch
virtio:remove-unused-block-field.patch
virtio:net_gso_hdr-add-hdr_len.patch
virtio:net_simplify-gso-features.patch
virtio:net-setup-in-probe-not-open.patch
virtio:reset.patch

# virtio: bug fixes
virtio:more-interrupt-suppression.patch

# virtio: cleanups
virtio:move-under-virtualization-menu.patch
virtio:use-sg_phys.patch

# virtio net bugfixes
virtio:virtnet_remove_double_ether_setup.patch
virtio:net-flush-queue-on-init.patch
virtio:net-fix-xmit-skb-free-real.patch

# virtio net enhancements
virtio:virtnet-parameterize-napi-weight.patch

# virtio block enhancements
virtio:blk_provide_getgeo.patch
virtio:modular-virtio.patch

# virtio PCI
virtio:pci-device.patch
virtio:use_pci_revision_field_to_indicate_pci_abi_version.patch

# new virtio drivers
virtio:new-balloon.patch

# typesafe patches
misc:cast_if_type.patch
misc:stop_machine-typesafe.patch
misc:kthread-typesafe.patch
misc:request_irq-typesafe.patch
misc:timer-typesafe.patch

# AIO patches
misc:aio-negative-offset.patch
misc:aio-partial-write.patch
misc:removal_of_futex_fd.patch
## still pending

# MM_PATCHES_END

# From here on, it's experimental and crazy stuff (or stuff which was sent
# via other maintainers).
virtio:entropy-device.patch

module:post-hook.patch
misc:remove-vfs_caches_init_early.patch
misc:tap-with-gso.patch
misc:tap-features.patch
lguest:use-tap-gso.patch
lguest:allow-non-gso.patch
lguest:fixup-container_of_usage.patch
lguest:config_changed.patch
lguest:balloon-support.patch
misc:sg_chain-remove-end-bit.patch
#virtio:use-sg-chain.patch
#virtio:blk-sg_chain-based.patch
virtio:documentation.patch
virtio:virtio_net-performance-stats.patch

#misc:timer-slop.patch
lguest:dump_devices.patch
misc:stop_machine-convert-typesafe.patch
misc:request_irq-correct-handler-type.patch
misc:fix-net-null-request_irq.patch
lguest:typesafe-irq-handler.patch
misc:fixup-kthread-users-typesafe.patch
misc:request_irq-BUG_ON.patch
misc:alloc_goodsize_table.patch