public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bruno Randolf <br1@einfach•org>
Cc: "John W. Linville" <linville@tuxdriver•com>,
	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: Thu, 11 Mar 2010 14:04:09 +1100	[thread overview]
Message-ID: <20100311140409.a9ae210c.sfr@canb.auug.org.au> (raw)
In-Reply-To: <201003111138.12070.br1@einfach.org>

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

Hi Bruno,

On Thu, 11 Mar 2010 11:38:11 +0900 Bruno Randolf <br1@einfach•org> wrote:
>
> not sure what happened...
> 
> but wireless-next-2.6.git 86415d43efd4f7093979cfa8a80232114266f1a4 is an older 
> version of my patch. i have sent one which applies cleanly later on.

The tree I call wireless-current usually only contains bug fixes, the
tree I call wireless is stuff for the next release ...

> your fix is correct, though.

Thanks for the confirmation.

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

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

  reply	other threads:[~2010-03-11  3:04 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-11  2:15 linux-next: manual merge of the wireless tree with the wireless-current tree Stephen Rothwell
2010-03-11  2:38 ` Bruno Randolf
2010-03-11  3:04   ` Stephen Rothwell [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-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-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-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=20100311140409.a9ae210c.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=br1@einfach$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=linville@tuxdriver$(echo .)com \
    /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