* linux-next: rr/driver-core merge conflict
@ 2008-05-30 3:20 Stephen Rothwell
2008-05-30 3:55 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2008-05-30 3:20 UTC (permalink / raw)
To: Greg KH, Rusty Russell; +Cc: linux-next, Cornelia Huck
[-- Attachment #1: Type: text/plain, Size: 409 bytes --]
Hi Greg, Rusty,
Today's linux-next merge of the rr tree got a trivial context conflict in
drivers/s390/kvm/kvm_virtio.c between "s390: Use s390_root_dev_* in
kvm_virtio" from the driver-core tree and "virtio:common-index-counters"
from the rr tree. I did the obvious fixup and will carry it.
--
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] 2+ messages in thread
* Re: linux-next: rr/driver-core merge conflict
2008-05-30 3:20 linux-next: rr/driver-core merge conflict Stephen Rothwell
@ 2008-05-30 3:55 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2008-05-30 3:55 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Rusty Russell, linux-next, Cornelia Huck
On Fri, May 30, 2008 at 01:20:09PM +1000, Stephen Rothwell wrote:
> Hi Greg, Rusty,
>
> Today's linux-next merge of the rr tree got a trivial context conflict in
> drivers/s390/kvm/kvm_virtio.c between "s390: Use s390_root_dev_* in
> kvm_virtio" from the driver-core tree and "virtio:common-index-counters"
> from the rr tree. I did the obvious fixup and will carry it.
Thanks. The s390 kvm patch came from the s390 kvm developers, so I hope
we can trust it :)
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-05-30 3:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-30 3:20 linux-next: rr/driver-core merge conflict Stephen Rothwell
2008-05-30 3:55 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox