linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: upstream,rr merge conflict
@ 2008-06-03  4:33 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2008-06-03  4:33 UTC (permalink / raw)
  To: Rusty Russell; +Cc: linux-next

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
include/linux/virtio_config.h between commit
b4f68be6c5d507afdcd74f5be3df0b1209cda503 ("virtio: force callback on
empty.") from Linus' tree and commit
47f299f584f925ee0bd7ae05c5a85efbcb1e6022 ("virtio:transport-features")
from the rr tree.  I kept both additions to the file.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-06-03  4:33 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-06-03  4:33 linux-next: upstream,rr merge conflict Stephen Rothwell

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).