On (Tue) 02 Apr 2013 [14:17:39], Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next merge of the virtio tree got a conflict in
> drivers/char/virtio_console.c between commit 9ba5c80b1aea ("virtio:
> console: add locking around c_ovq operations") from the rr-fixes tree and
> commit 6797999d
Hi Rusty,
Today's linux-next merge of the virtio tree got a conflict in
drivers/char/virtio_console.c between commit 9ba5c80b1aea ("virtio:
console: add locking around c_ovq operations") from the rr-fixes tree and
commit 6797999d9958 ("virtio_console: use simplified virtqueue
accessors") from the
2 matches
Mail list logo
