* linux-next: manual merge of the crypto tree with the bluetooth tree
@ 2015-06-20 6:22 Stephen Rothwell
2015-06-21 0:33 ` Herbert Xu
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2015-06-20 6:22 UTC (permalink / raw)
To: Herbert Xu, Gustavo Padovan
Cc: linux-next, linux-kernel, Simon Vincent, Marcel Holtmann
[-- Attachment #1: Type: text/plain, Size: 562 bytes --]
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@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the crypto tree with the bluetooth tree
2015-06-20 6:22 linux-next: manual merge of the crypto tree with the bluetooth tree Stephen Rothwell
@ 2015-06-21 0:33 ` Herbert Xu
2015-06-21 0:40 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Herbert Xu @ 2015-06-21 0:33 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Gustavo Padovan, linux-next, linux-kernel, Simon Vincent,
Marcel Holtmann
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@gondor•apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the crypto tree with the bluetooth tree
2015-06-21 0:33 ` Herbert Xu
@ 2015-06-21 0:40 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2015-06-21 0:40 UTC (permalink / raw)
To: Herbert Xu
Cc: Gustavo Padovan, linux-next, linux-kernel, Simon Vincent,
Marcel Holtmann
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
Hi Herbert,
On Sun, 21 Jun 2015 08:33:32 +0800 Herbert Xu <herbert@gondor•apana.org.au> wrote:
>
> Actually I think that's all you need to do since the crypto tree
> version no longer has the bug in question.
Ah, excellent. Thanks for checking.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-21 0:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-20 6:22 linux-next: manual merge of the crypto tree with the bluetooth tree Stephen Rothwell
2015-06-21 0:33 ` Herbert Xu
2015-06-21 0:40 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox