All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-next@vger.kernel.org,
	Reinette Chatre <reinette.chatre@intel.com>,
	Johannes Berg <johannes@sipsolutions.net>
Subject: linux-next: manual merge of the wireless tree with the wireless-current tree
Date: Wed, 22 Apr 2009 11:32:30 +1000	[thread overview]
Message-ID: <20090422113230.8c36e9ed.sfr@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 670 bytes --]

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

             reply	other threads:[~2009-04-22  1:32 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-22  1:32 Stephen Rothwell [this message]
2009-04-22 18:23 ` linux-next: manual merge of the wireless tree with the wireless-current tree reinette chatre
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-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=20090422113230.8c36e9ed.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=johannes@sipsolutions.net \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=reinette.chatre@intel.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.