Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  virtio: fix race in enable_cb
  virtio: Enable netpoll interface for netconsole logging
  virtio: handle > 2 billion page balloon targets
  virtio: Fix sysfs bits to have proper block symlink
  virtio: Use spin_lock_irqsave/restore for virtio-pci

...

This commit is contained in:

Linus Torvalds 2008-03-17 09:52:19 -07:00

parent 3d10a15d69 4265f161b6

commit 84841384ec

6 changed files with 34 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/block/virtio_blk.c

View file

22

drivers/net/virtio_net.c

View file

4

drivers/virtio/virtio_balloon.c

View file

15

drivers/virtio/virtio_pci.c

View file

1

drivers/virtio/virtio_ring.c

View file

5

include/linux/virtio.h

View file