linux-kernel - RE: linux-next: manual merge of the net tree with the net-current tree

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] [day] [month] [year] [list]

Message-ID: <7608421F3572AB4292BB2532AE89D565859E617F37@AVEXMB1.qlogic.org>
Date:	Thu, 13 Aug 2009 22:27:04 -0700
From:	Dhananjay Phadke <dhananjay.phadke@...gic.com>
To:	David Miller <davem@...emloft.net>,
	"sfr@...b.auug.org.au" <sfr@...b.auug.org.au>
CC:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Amit Salecha <amit.salecha@...gic.com>
Subject: RE: linux-next: manual merge of the net tree with the net-current
 tree

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@...emloft.net] 
> Sent: Thursday, August 13, 2009 19:51
> To: sfr@...b.auug.org.au
> Cc: linux-next@...r.kernel.org; linux-kernel@...r.kernel.org; 
> Dhananjay Phadke; Amit Salecha
> Subject: Re: linux-next: manual merge of the net tree with 
> the net-current tree
> 
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> 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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/