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,
Kees Cook <keescook@chromium.org>,
Larry Finger <Larry.Finger@lwfinger.net>,
"John W. Linville" <linville@tuxdriver.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the tree
Date: Thu, 14 Feb 2013 21:24:21 -0800 [thread overview]
Message-ID: <20130215052421.GA3789@kroah.com> (raw)
In-Reply-To: <20130215160124.52d9bfb269ad1ffd390d4851@canb.auug.org.au>
On Fri, Feb 15, 2013 at 04:01:24PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/net/wireless/rtlwifi/Kconfig between commit 06e7cda3ce30
> ("rtlwifi: Rework Kconfig") from the wireless-next tree and commit
> 6cba014857f4 ("drivers/net/wireless/rtlwifi: remove depends on
> CONFIG_EXPERIMENTAL") from the driver-core tree.
>
> I fixed it up (the former is a superset of the latter, so I used that)
> and can carry the fix as necessary (no action is required).
That sounds fine, thanks.
greg k-h
next prev parent reply other threads:[~2013-02-15 5:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-15 5:01 linux-next: manual merge of the driver-core tree with the tree Stephen Rothwell
2013-02-15 5:24 ` Greg KH [this message]
2013-02-15 17:04 ` Larry Finger
-- strict thread matches above, loose matches on Subject: below --
2014-11-10 4:21 Stephen Rothwell
2014-11-10 4:36 ` Stephen Rothwell
2014-11-10 4:40 ` Greg KH
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=20130215052421.GA3789@kroah.com \
--to=greg@kroah.com \
--cc=Larry.Finger@lwfinger.net \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).