linux-kernel - Re: linux-next: manual merge of the crypto tree with the bluetooth 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: <20150621003331.GA26768@gondor.apana.org.au>
Date:	Sun, 21 Jun 2015 08:33:32 +0800
From:	Herbert Xu <herbert@...dor.apana.org.au>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Gustavo Padovan <gustavo@...ovan.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Simon Vincent <simon.vincent@...lon.com>,
	Marcel Holtmann <marcel@...tmann.org>
Subject: Re: linux-next: manual merge of the crypto tree with the bluetooth
 tree

Hi Stephen:

On Sat, Jun 20, 2015 at 04:22:24PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
> 
> Today's linux-next merge of the crypto tree got a conflict in:
> 
>   net/mac802154/llsec.c
> 
> between commit:
> 
>   5b0579850017 ("mac802154: fix llsec authentication without encryption BUG")
> 
> from the bluetooth tree and commit:
> 
>   25528fdae4ab ("mac802154: Switch to new AEAD interface")
> 
> from the crypto tree.
> 
> I just used the crypto tree version (effectively dropping the former
> commit) since it is more extensive and so a better conflict resolution
> is needed.

Actually I think that's all you need to do since the crypto tree
version no longer has the bug in question.

Thanks,
-- 
Email: Herbert Xu <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at  http://www.tux.org/lkml/