From: "John W. Linville" <linville@tuxdriver.com>
To: Tomas Winkler <tomasw@gmail.com>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>,
linux-wireless@vger.kernel.org,
David Miller <davem@davemloft.net>,
sfr@canb.auug.org.au, akpm@linux-foundation.org,
netdev@vger.kernel.org
Subject: Re: New GIT net tree naming...
Date: Mon, 12 May 2008 14:47:15 -0400 [thread overview]
Message-ID: <20080512184715.GA18910@tuxdriver.com> (raw)
In-Reply-To: <1ba2fa240805121039u1fc4273eh706c8868748b500c@mail.gmail.com>
On Mon, May 12, 2008 at 08:39:22PM +0300, Tomas Winkler wrote:
> How would you want me to handle bug fixes to go both directions
> wireless-testing and upstream?
> Because of huge code movement we are now doing in iwlwifi they are
> currently just not the same.
> Shell I send two versions or you want to back port them not sure how
> do you want to track this...somewhere in merging loop it will create a
> conflict. Maybe this is maintainer trivia anyhow
> I would like to make sure there are not glitches.
It is a good question -- thanks for asking!
If you think that two versions of the fix are appropriate, then please
do send them. If it is simply because the code moved I'll probably
be able to figure it out, but if the code has actually changed it
may be worthwhile.
We are now trying to avoid rebasing "-next" patches as much as possible.
So the version for the current release will be merged to Linus and I or
Dave will have to figure-out how to resolve the merge conflicts when
current is pulled to -next. Providing a "-next' version of the patch
can help to make sure that those merge conflicts are handled correctly.
John
--
John W. Linville
linville@tuxdriver.com
next prev parent reply other threads:[~2008-05-12 19:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-20 0:35 New GIT net tree naming David Miller
2008-04-21 1:45 ` Stephen Rothwell
2008-04-21 7:53 ` Ian Brown
2008-04-21 7:56 ` David Miller
2008-04-21 8:00 ` YOSHIFUJI Hideaki / 吉藤英明
2008-04-21 8:13 ` Ian Brown
2008-04-21 8:17 ` David Miller
[not found] ` <20080419.173510.257216556.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2008-05-08 1:43 ` John W. Linville
[not found] ` <20080508014358.GE3412-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2008-05-08 7:06 ` Holger Schurig
[not found] ` <200805080906.29603.hs4233-x6+DxXLjN1AJvtFkdXX2Hg4jNU5vUVPG@public.gmane.org>
2008-05-08 14:40 ` John W. Linville
2008-05-12 17:39 ` Tomas Winkler
2008-05-12 18:47 ` John W. Linville [this message]
[not found] ` <20080512184715.GA18910-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2008-05-13 10:05 ` Tomas Winkler
[not found] ` <1ba2fa240805130305q207067b0n572b95340a3745d6-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2008-05-13 13:26 ` John W. Linville
2008-05-08 7:42 ` 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=20080512184715.GA18910@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=hs4233@mail.mn-solutions.de \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tomasw@gmail.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 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).