All of lore.kernel.org
 help / color / mirror / Atom feed
From: "John W. Linville" <linville@tuxdriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the wireless tree with the wireless-current tree
Date: Tue, 24 Nov 2009 10:05:25 -0500	[thread overview]
Message-ID: <20091124150525.GA2782@tuxdriver.com> (raw)
In-Reply-To: <20091124141141.5b6d3a8d.sfr@canb.auug.org.au>

On Tue, Nov 24, 2009 at 02:11:41PM +1100, Stephen Rothwell wrote:
> Hi John,
> 
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/ath/ath9k/main.c between commit
> 54ab040d24904d1fa2c0a6a27936b7c56a4efb24 ("ath9k: set ps_default as
> false") from the wireless-current tree and commit
> 18b6c9a2213d3b6e0212e8b225abf95f7564206a ("ath9k: set ps_default as
> false") from the wireless tree.
> 
> The commit message of the latter made me use just its version.

Yes, that's the correct fix. :-)

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

  reply	other threads:[~2009-11-24 15:15 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-24  3:11 linux-next: manual merge of the wireless tree with the wireless-current tree Stephen Rothwell
2009-11-24 15:05 ` John W. Linville [this message]
  -- 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-07-09  1:40 Stephen Rothwell
2009-04-22  1:32 Stephen Rothwell
2009-04-22 18:23 ` reinette chatre
2009-04-22 18:38   ` John W. Linville
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=20091124150525.GA2782@tuxdriver.com \
    --to=linville@tuxdriver.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --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 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.