Matheos Worku wrote: > Jeff Garzik wrote: >> Auke Kok wrote: >>> From: Matheos Worku <[EMAIL PROTECTED]> >>> >>> Implement support for a SUN-specific PHY. >>> >>> SUN provides a modified 82597-based board with their own >>> PHY that works with very little modification to the code. This >>> patch implements this new PHY which is identified by the >>> subvendor device ID. The device ID of the adapter remains >>> the same. >>> >>> Signed-off-by: Matheos Worku <[EMAIL PROTECTED]> >>> Signed-off-by: Jesse Brandeburg <[EMAIL PROTECTED]> >>> Signed-off-by: Auke Kok <[EMAIL PROTECTED]> >>> --- >>> >>> drivers/net/ixgb/ixgb_hw.c | 82 >>> +++++++++++++++++++++++++++++++++++++++++- >>> drivers/net/ixgb/ixgb_hw.h | 3 +- >>> drivers/net/ixgb/ixgb_ids.h | 4 ++ >>> drivers/net/ixgb/ixgb_main.c | 10 +++-- >>> 4 files changed, 91 insertions(+), 8 deletions(-) >> >> applied #upstream >> >> > > Jeff, > Bleated Happy New Year. > > I was wondering when this patch will make it to Linus' and other > trees. I just checked Linus's and other net trees, including > git.kernel.org/?p=linux/kernel/git/jgarzik/netdev-2.6.git and I see only > the other patch's commit: 3fd7131feacc01c1e23e46c416228f36ebdcc0d4, and > not this patch.
It's in the "upstream" branch of that tree: http://git.kernel.org/?p=linux/kernel/git/jgarzik/netdev-2.6.git;a=history;f=drivers/net/ixgb;hb=upstream this should be merged in the currently open merge window, so you'll find it eventually in the 2.6.25 kernel release. Cheers, Auke -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
