Skip to contentSkip to conversation

Bogus commit 70eba18b ("make bnx2x select ZLIB_INFLATE")?

DISCUSSION Roland Dreier 3 participants 3 messages Dec 9, 2007

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Roland Dreier

author
#0 lore raw

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.

#1 lore raw
Quoted 8 lines · Roland Dreier

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

maintainer
#2 lore raw
In reply to Roland Dreier

From: Roland Dreier <[email protected]>
Date: Sat, 08 Dec 2007 19:07:22 -0800

Quoted 8 lines

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.