From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Herbert Xu <herbert@gondor•apana.org.au>,
Gustavo Padovan <gustavo@padovan•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Simon Vincent <simon.vincent@xsilon•com>,
Marcel Holtmann <marcel@holtmann•org>
Subject: linux-next: manual merge of the crypto tree with the bluetooth tree
Date: Sat, 20 Jun 2015 16:22:24 +1000 [thread overview]
Message-ID: <20150620162224.24da2d9f@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2015-06-20 6:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-20 6:22 Stephen Rothwell [this message]
2015-06-21 0:33 ` linux-next: manual merge of the crypto tree with the bluetooth tree Herbert Xu
2015-06-21 0:40 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150620162224.24da2d9f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gustavo@padovan$(echo .)org \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marcel@holtmann$(echo .)org \
--cc=simon.vincent@xsilon$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox