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

From: Joe Perches
Date: Sun Feb 10 2013 - 21:58:56 EST

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).

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;
+ }


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at