* Bogus commit 70eba18b ("make bnx2x select ZLIB_INFLATE")?
@ 2007-12-09 3:07 Roland Dreier
2007-12-09 4:48 ` Jeff Garzik
2007-12-09 8:52 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Roland Dreier @ 2007-12-09 3:07 UTC (permalink / raw)
To: netdev, Jeff Garzik, torvalds; +Cc: Eliezer Tamir, Lee Schermerhorn
Commit 70eba18b ("make bnx2x select ZLIB_INFLATE") in Linus's tree
seems bogus. As far as I can tell, bnx2x is not upstream yet, and the
commit in question actually adds "select ZLIB_INFLATE" to the TEHUTI
config, since there is no BNX2X config option (and also I don't see
any reference to zlib in any tehuti files).
I assume this is some sort of merge problem that got added to the
wrong tree and should be reverted upstream.
- R.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Bogus commit 70eba18b ("make bnx2x select ZLIB_INFLATE")?
2007-12-09 3:07 Bogus commit 70eba18b ("make bnx2x select ZLIB_INFLATE")? Roland Dreier
@ 2007-12-09 4:48 ` Jeff Garzik
2007-12-09 8:52 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2007-12-09 4:48 UTC (permalink / raw)
To: Roland Dreier; +Cc: netdev, torvalds, Eliezer Tamir, Lee Schermerhorn
Roland Dreier wrote:
> Commit 70eba18b ("make bnx2x select ZLIB_INFLATE") in Linus's tree
> seems bogus. As far as I can tell, bnx2x is not upstream yet, and the
> commit in question actually adds "select ZLIB_INFLATE" to the TEHUTI
> config, since there is no BNX2X config option (and also I don't see
> any reference to zlib in any tehuti files).
>
> I assume this is some sort of merge problem that got added to the
> wrong tree and should be reverted upstream.
Yeah DaveM pointed that too. My fault (and yes it should be reverted
upstream... I've prepared a commit for my next round of submissions)
Jeff
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Bogus commit 70eba18b ("make bnx2x select ZLIB_INFLATE")?
2007-12-09 3:07 Bogus commit 70eba18b ("make bnx2x select ZLIB_INFLATE")? Roland Dreier
2007-12-09 4:48 ` Jeff Garzik
@ 2007-12-09 8:52 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2007-12-09 8:52 UTC (permalink / raw)
To: rdreier; +Cc: netdev, jeff, torvalds, eliezert, lee.schermerhorn
From: Roland Dreier <rdreier@cisco.com>
Date: Sat, 08 Dec 2007 19:07:22 -0800
> Commit 70eba18b ("make bnx2x select ZLIB_INFLATE") in Linus's tree
> seems bogus. As far as I can tell, bnx2x is not upstream yet, and the
> commit in question actually adds "select ZLIB_INFLATE" to the TEHUTI
> config, since there is no BNX2X config option (and also I don't see
> any reference to zlib in any tehuti files).
>
> I assume this is some sort of merge problem that got added to the
> wrong tree and should be reverted upstream.
I already pointed this out to Jeff, here:
http://marc.info/?l=linux-netdev&m=119709982603567&w=2
Indeed, it needs to be fixed up.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-12-09 8:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-09 3:07 Bogus commit 70eba18b ("make bnx2x select ZLIB_INFLATE")? Roland Dreier
2007-12-09 4:48 ` Jeff Garzik
2007-12-09 8:52 ` David Miller
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).