From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 22 Aug 2017 06:53:32 +0000 (+0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: kvm-4.14-2~67^2~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e90c48efde40f8428777424e6edbbb240b441652;p=users%2Fdwmw2%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to resolve the conflict between the temporary
and long-term fixes in algif_skcipher.
---

e90c48efde40f8428777424e6edbbb240b441652