Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1169293
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the crypto tree with the bluetooth tree |
| Date | 2015-06-20 08:30 +0200 |
| Message-ID | <pDkrU-6w6-3@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
[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
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
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
csiph-web