From: reinette chatre <reinette.chatre@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
"John W. Linville" <linville@tuxdriver.com>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
Johannes Berg <johannes@sipsolutions.net>
Subject: Re: linux-next: manual merge of the wireless tree with the wireless-current tree
Date: Wed, 22 Apr 2009 11:23:46 -0700 [thread overview]
Message-ID: <1240424626.29805.51.camel@rc-desk> (raw)
In-Reply-To: <20090422113230.8c36e9ed.sfr@canb.auug.org.au>
John,
On Tue, 2009-04-21 at 18:32 -0700, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> net/mac80211/pm.c between commit 7d42081a271bd8a82f2100524085c4f029e47717
> ("mac80211: do not print WARN if config interface") from the
> wireless-current tree and commit aa3590f6a8ebc24d38698ffb81fb51e97f03c4f4
> ("mac80211: add hardware restart function") from the wireless tree.
>
> The latter moved the code (to net/mac80211/util.c:ieee80211_reconfig)
> that the former modified. I just used the version in the wireless tree
> and will leave you to fix this up when the merge happens.
I have no idea how merges work upstream but there is a version of the
"mac80211: do not print WARN if config interface" patch [1] that applies
to net/mac80211/util.c:ieee80211_reconfig. Perhaps it will be easiest to
apply that patch after "mac80211: add hardware restart function"?
Reinette
[1] http://marc.info/?l=linux-wireless&m=124026667231209&w=2
next prev parent reply other threads:[~2009-04-22 18:17 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-22 1:32 linux-next: manual merge of the wireless tree with the wireless-current tree Stephen Rothwell
2009-04-22 18:23 ` reinette chatre [this message]
2009-04-22 18:38 ` John W. Linville
-- strict thread matches above, loose matches on Subject: below --
2011-09-28 3:19 Stephen Rothwell
2011-09-28 9:10 ` Jouni Malinen
2011-09-14 3:05 Stephen Rothwell
2011-06-21 1:49 Stephen Rothwell
2011-06-21 18:05 ` Gustavo F. Padovan
2011-04-05 2:21 Stephen Rothwell
2011-04-05 2:21 Stephen Rothwell
2010-12-14 2:22 Stephen Rothwell
2010-08-30 1:58 Stephen Rothwell
2010-04-09 1:05 Stephen Rothwell
2010-04-07 2:58 Stephen Rothwell
2010-04-07 14:44 ` John W. Linville
2010-04-07 15:31 ` Stephen Rothwell
2010-04-07 23:19 ` David Miller
2010-04-01 1:59 Stephen Rothwell
2010-04-01 11:43 ` John W. Linville
2010-03-11 2:15 Stephen Rothwell
2010-03-11 2:38 ` Bruno Randolf
2010-03-11 3:04 ` Stephen Rothwell
2010-02-23 1:26 Stephen Rothwell
2009-11-24 3:11 Stephen Rothwell
2009-11-24 15:05 ` John W. Linville
2009-07-09 1:40 Stephen Rothwell
2009-02-19 5:27 Stephen Rothwell
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=1240424626.29805.51.camel@rc-desk \
--to=reinette.chatre@intel.com \
--cc=johannes@sipsolutions.net \
--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).