netdev - Re: New GIT net tree naming...

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20080512184715.GA18910@tuxdriver.com>
Date:	Mon, 12 May 2008 14:47:15 -0400
From:	"John W. Linville" <linville@...driver.com>
To:	Tomas Winkler <tomasw@...il.com>
Cc:	Holger Schurig <hs4233@...l.mn-solutions.de>,
	linux-wireless@...r.kernel.org, David Miller <davem@...emloft.net>,
	sfr@...b.auug.org.au, akpm@...ux-foundation.org,
	netdev@...r.kernel.org
Subject: Re: New GIT net tree naming...

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@...driver.com
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html