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
| ||
|
Message-ID: <20101006132708.GC2472@tuxdriver.com> Date: Wed, 6 Oct 2010 09:27:08 -0400 From: "John W. Linville" <linville@...driver.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: David Miller <davem@...emloft.net>, netdev@...r.kernel.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Dan Carpenter <error27@...il.com>, Joe Perches <joe@...ches.com> Subject: Re: linux-next: manual merge of the net tree with the wireless tree On Wed, Oct 06, 2010 at 12:09:08PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net tree got a conflict in > drivers/net/wireless/ipw2x00/ipw2200.c between commit > 2ee4e27cf25ab647137713ca16377d8d9e138ea2 ("ipw2200: check for allocation > failures") from the wireless tree and commit > baeb2ffab4e67bb9174e6166e070a9a8ec94b0f6 ("drivers/net: Convert unbounded > kzalloc calls to kcalloc") from the net tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. That looks correct to me -- thanks! John -- John W. Linville Someday the world will need a hero, and you linville@...driver.com might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists