• Linus Torvalds's avatar
    Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · 1756ac3d
    Linus Torvalds authored
    * 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (27 commits)
      drivers/char: Eliminate use after free
      virtio: console: Accept console size along with resize control message
      virtio: console: Store each console's size in the console structure
      virtio: console: Resize console port 0 on config intr only if multiport is off
      virtio: console: Add support for nonblocking write()s
      virtio: console: Rename wait_is_over() to will_read_block()
      virtio: console: Don't always create a port 0 if using multiport
      virtio: console: Use a control message to add ports
      virtio: console: Move code around for future patches
      virtio: console: Remove config work handler
      virtio: console: Don't call hvc_remove() on unplugging console ports
      virtio: console: Return -EPIPE to hvc_console if we lost the connection
      virtio: console: Let host know of port or device add failures
      virtio: console: Add a __send_control_msg() that can send messages without a valid port
      virtio: Revert "virtio: disable multiport console support."
      virtio: add_buf_gfp
      trans_virtio: use virtqueue_xxx wrappers
      virtio-rng: use virtqueue_xxx wrappers
      virtio_ring: remove a level of indirection
      virtio_net: use virtqueue_xxx wrappers
      ...
    
    Fix up conflicts in drivers/net/virtio_net.c due to new virtqueue_xxx
    wrappers changes conflicting with some other cleanups.
    1756ac3d
virtio_net.c 27.1 KB