From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Rusty Russell <rusty@rustcorp•com.au>,
linux-next@vger•kernel.org,
Cornelia Huck <cornelia.huck@de•ibm.com>
Subject: Re: linux-next: rr/driver-core merge conflict
Date: Thu, 29 May 2008 20:55:00 -0700 [thread overview]
Message-ID: <20080530035500.GA7302@kroah.com> (raw)
In-Reply-To: <20080530132009.398754a5.sfr@canb.auug.org.au>
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
prev parent reply other threads:[~2008-05-30 3:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-30 3:20 linux-next: rr/driver-core merge conflict Stephen Rothwell
2008-05-30 3:55 ` Greg KH [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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080530035500.GA7302@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=cornelia.huck@de$(echo .)ibm.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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