From mboxrd@z Thu Jan 1 00:00:00 1970 From: Luciano Coelho Subject: Re: linux-next: manual merge of the wireless-next tree with the net-next tree Date: Mon, 11 Feb 2013 08:47:54 +0200 Message-ID: <1360565274.12803.45.camel@cumari.coelho.fi> References: <20130211133350.5f510bbb28759960a19a98af@canb.auug.org.au> <1360551527.2028.10.camel@joe-AO722> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from bear.ext.ti.com ([192.94.94.41]:50396 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751926Ab3BKGtM (ORCPT ); Mon, 11 Feb 2013 01:49:12 -0500 In-Reply-To: <1360551527.2028.10.camel@joe-AO722> Sender: linux-next-owner@vger.kernel.org List-ID: To: Joe Perches Cc: Stephen Rothwell , "John W. Linville" , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Miller , netdev@vger.kernel.org On Sun, 2013-02-10 at 18:58 -0800, Joe Perches wrote: > On Mon, 2013-02-11 at 13:33 +1100, Stephen Rothwell wrote: > > Hi John, > > > > Today's linux-next merge of the wireless-next tree got conflicts in > > drivers/net/wireless/ti/wlcore/sdio.c and > > drivers/net/wireless/ti/wlcore/spi.c between commit 0d2e7a5c6080 > > ("wireless: Remove unnecessary alloc/OOM messages, alloc cleanups") from > > the net-next tree and commit afb43e6d88e5 ("wlcore: remove if_ops from > > platform_data") from the wireless-next tree. > > > > I fixed it up (see below) and can carry the fix as necessary (no action > > is required). > > The fix up looks good. Thanks! > Thanks Stephen. > > Can you remove just the dev_err below too please. > > + pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL); > + if (!pdev_data) { > + dev_err(&func->dev, "can't allocate platdev_data\n"); > + goto out; > + } Yes, and there's also another one in drivers/net/wireless/ti/wlcore/spi.c: + pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL); + if (!pdev_data) { + dev_err(&spi->dev, "can't allocate platdev_data\n"); + goto out; + } -- Cheers, Luca.