linux-next: manual merge of the virtio tree with Linus' tree

2015-03-17 Thread Stephen Rothwell
Hi Rusty, Today's linux-next merge of the virtio tree got a conflict in net/9p/trans_virtio.c between commit 8051a2a518fc ("9p/trans_virtio: fix hot-unplug") from Linus' tree and commit 1991755689ad ("9p/trans_virtio: fix hot-unplug") from the virtio tree. I fixed it up (the latter is an older ve

linux-next: manual merge of the virtio tree with Linus' tree

2014-06-11 Thread Stephen Rothwell
Hi Rusty, Today's linux-next merge of the virtio tree got a conflict in drivers/scsi/virtio_scsi.c between commit b54197c43db8 ("virtio_scsi: use cmd_size") from Linus' tree and commit c77fba9ab058 ("virtio_scsi: don't call virtqueue_add_sgs(... GFP_NOIO) holding spinlock") from the virtio tree.

linux-next: manual merge of the virtio tree with Linus' tree

2012-12-12 Thread Stephen Rothwell
Hi Rusty, Today's linux-next merge of the virtio tree got a conflict in drivers/virtio/virtio_balloon.c between commit e22504296d4f ("virtio_balloon: introduce migration primitives to balloon pages") from Linus' tree and commit 41395dfb3d35 ("virtio: Convert dev_printk (KERN_ to dev_(") from the v