linux-kernel - Re: linux-next: manual merge of the wireless-next tree with the net-next 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] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130211184056.9a128947490514408c33b3ae@canb.auug.org.au>
Date:	Mon, 11 Feb 2013 18:40:56 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Luciano Coelho <coelho@...com>
Cc:	Joe Perches <joe@...ches.com>,
	"John W. Linville" <linville@...driver.com>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Subject: Re: linux-next: manual merge of the wireless-next tree with the
 net-next tree

Hi all,

On Mon, 11 Feb 2013 08:47:54 +0200 Luciano Coelho <coelho@...com> 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 :-))

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped