Re: linux-next: build failure after merge of the wireless-next tree

From: Stephen Rothwell
Date: Wed Feb 12 2014 - 21:22:37 EST


Hi John,

On Thu, 13 Feb 2014 13:19:23 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> I added this merge fix patch and can carry it as necessary (John, if you
> back merge v3.14-rc1, you should include this patch in the merge commit):

Actually, your tree is based on -rc2, so you need this patch already (it
should have bee included in the merge commit 841577c3d33b ("Merge branch
'for-john' of
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next").

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgpRcS6smLdro.pgp
Description: PGP signature