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

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

Hi Rusty,

We also got conflicts in drivers/s390/kvm/kvm_virtio.c and
drivers/virtio/virtio.c which are caused by patches being merged
upstream.  I assume that "virtio:bus_id-should-contain-virtio-name" and
"virtio:common-index-counters" need to be removed from the rr tree.

-- 
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:28 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:28 linux-next: conflicts in rr merge 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).