linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20150620162224.24da2d9f@canb.auug.org.au>
Date:	Sat, 20 Jun 2015 16:22:24 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Herbert Xu <herbert@...dor.apana.org.au>,
	Gustavo Padovan <gustavo@...ovan.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Simon Vincent <simon.vincent@...lon.com>,
	Marcel Holtmann <marcel@...tmann.org>
Subject: linux-next: manual merge of the crypto tree with the bluetooth tree

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.

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

Content of type "application/pgp-signature" skipped