From mboxrd@z Thu Jan 1 00:00:00 1970 From: "John W. Linville" Subject: Re: linux-next: manual merge of the net tree with the wireless tree Date: Wed, 6 Oct 2010 09:27:08 -0400 Message-ID: <20101006132708.GC2472@tuxdriver.com> References: <20101006120908.ffe99876.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20101006120908.ffe99876.sfr@canb.auug.org.au> Sender: netdev-owner@vger.kernel.org To: Stephen Rothwell Cc: David Miller , netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Carpenter , Joe Perches List-Id: linux-next.vger.kernel.org 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@tuxdriver.com might be all we have. Be ready.