Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1169293 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-06-20 08:30 +0200 |
| Last post | 2015-06-21 02:50 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the crypto tree with the bluetooth tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-06-20 08:30 +0200
Re: linux-next: manual merge of the crypto tree with the bluetooth tree Herbert Xu <herbert@gondor.apana.org.au> - 2015-06-21 02:40 +0200
Re: linux-next: manual merge of the crypto tree with the bluetooth tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-06-21 02:50 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-06-20 08:30 +0200 |
| Subject | linux-next: manual merge of the crypto tree with the bluetooth tree |
| Message-ID | <pDkrU-6w6-3@gated-at.bofh.it> |
[Multipart message — attachments visible in raw view] — view raw
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
[toc] | [next] | [standalone]
| From | Herbert Xu <herbert@gondor.apana.org.au> |
|---|---|
| Date | 2015-06-21 02:40 +0200 |
| Subject | Re: linux-next: manual merge of the crypto tree with the bluetooth tree |
| Message-ID | <pDBsK-61q-19@gated-at.bofh.it> |
| In reply to | #1169293 |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-06-21 02:50 +0200 |
| Subject | Re: linux-next: manual merge of the crypto tree with the bluetooth tree |
| Message-ID | <pDBCp-6cA-3@gated-at.bofh.it> |
| In reply to | #1169497 |
[Multipart message — attachments visible in raw view] — view raw
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web