linux-kernel - Re: linux-next: build failure after merge of the wireless-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]

Date:	Thu, 13 Feb 2014 13:22:24 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"John W. Linville" <linville@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Greg KH <greg@...ah.com>,
	Johannes Berg <johannes.berg@...el.com>
Subject: Re: linux-next: build failure after merge of the wireless-next tree

Hi John,

On Thu, 13 Feb 2014 13:19:23 +1100 Stephen Rothwell <sfr@...b.auug.org.au> 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@...b.auug.org.au

Content of type "application/pgp-signature" skipped