Well yeah, I had already confessed in the introductory mail. http://article.gmane.org/gmane.linux.network/135134 I have verified my own cherry-picked version of net-next driver, will do that again once Dave fixes the tree. Thanks, Dhananjay > -----Original Message----- > From: David Miller [mailto:davem@xxxxxxxxxxxxx] > Sent: Thursday, August 13, 2009 19:51 > To: sfr@xxxxxxxxxxxxxxxx > Cc: linux-next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; > Dhananjay Phadke; Amit Salecha > Subject: Re: linux-next: manual merge of the net tree with > the net-current tree > > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Date: Fri, 14 Aug 2009 12:40:40 +1000 > > > Hi David, > > > > Today's linux-next merge of the net tree got a conflict in > > drivers/net/netxen/netxen_nic_main.c between commits > > e424fa9d6a0add1a9b812b07e3607daaa5b9e53d ("netxen: remove netxen > > workqueue") and 232e7d68d50c9ac3a55d716e5ae215ecd1e043b9 > ("netxen: free > > napi resources during detach") from the net-current tree and commits > > 6598b169b856793f8f9b80a3f3c5a48f5eaf40e3 ("netxen: enable ip addr > > hashing"), f17443f4b01659a5c44d5fc6f5c502c39c293959 > ("netxen: refactor > > net_device setup code") and 7042cd8f148345bfca6c336f009c96a416674f5e > > ("netxen: support for ethtool set ringparam") from the net tree. > > > > I fixed it up (I hope) (see below) and can carry the fix as > necessary. > > Thanks for the note Stephen. > > I'll do a merge of net-2.6 into net-next-2.6 to resolve this > and get it out of your hair. > > No virus found in this incoming message. > Checked by AVG - www.avg.com > Version: 8.5.392 / Virus Database: 270.13.54/2300 - Release > Date: 08/13/09 18:16:00 > -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
