archive mirror
 help / color / mirror / Atom feed
From: Amit Shah <>
To: Stephen Rothwell <>
Cc: Rusty Russell <>,,
Subject: Re: linux-next: manual merge of the virtio tree with the rr-fixes tree
Date: Tue, 2 Apr 2013 10:59:35 +0530	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

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 6797999d9958 ("virtio_console: use simplified virtqueue
> accessors") from the virtio tree.
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks OK, just a context change.



      reply	other threads:[~2013-04-02  5:29 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-02  3:17 linux-next: manual merge of the virtio tree with the rr-fixes tree Stephen Rothwell
2013-04-02  5:29 ` Amit Shah [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).