From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Rusty Russell <rusty@rustcorp•com.au>,
Kees Cook <keescook@chromium•org>
Subject: Re: linux-next: manual merge of the driver-core tree with the virtio tree
Date: Tue, 19 Feb 2013 20:34:24 -0800 [thread overview]
Message-ID: <20130220043424.GA2513@kroah.com> (raw)
In-Reply-To: <20130220152507.4d7405fcb3561213b4ccd7ab@canb.auug.org.au>
On Wed, Feb 20, 2013 at 03:25:07PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got conflicts in
> drivers/vhost/Kconfig and drivers/vhost/Kconfig.tcm between commit
> 4d8dc8b44748 ("vringh: host-side implementation of virtio rings") from
> the virtio tree and commit 43893cbefc1b ("drivers/vhost: remove depends
> on CONFIG_EXPERIMENTAL") from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks.
greg k-h
prev parent reply other threads:[~2013-02-20 4:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 4:25 linux-next: manual merge of the driver-core tree with the virtio tree Stephen Rothwell
2013-02-20 4:34 ` 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=20130220043424.GA2513@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--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