Re: linux-next: manual merge of the wireless-next tree with thenet-next tree

[Luciano Coelho]

On Mon, 2013-02-11 at 18:40 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 11 Feb 2013 08:47:54 +0200 Luciano Coelho <coelho@xxxxxx> wrote:
> >
> > On Sun, 2013-02-10 at 18:58 -0800, Joe Perches wrote:
> > > On Mon, 2013-02-11 at 13:33 +1100, Stephen Rothwell wrote:
> > > > 
> > > > 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;
> > +       }
> 
> I presume that there is no harm in actually fixing these extra ones
> directly in the wireless-next tree, right?  (hint, John, hint :-))

I'll send a patch fixing this in a minute.

--
Luca.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/