diff options
| author | James Morris <jmorris@namei.org> | 2018-02-21 08:21:41 -0800 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2018-02-21 08:21:41 -0800 |
| commit | 45ce5d915020b8c76238e123748e0eb6e9ddd6ad (patch) | |
| tree | 916682ca7617ad686d2f8f9cac41ec4e9c432b00 /crypto/blkcipher.c | |
| parent | 4a06f454768a7e11e8f10b900b450786546cbba1 (diff) | |
| parent | 17a3638239bb39acce5f03e779c69bc0e4a5c736 (diff) | |
| download | linux-crypto-45ce5d915020b8c76238e123748e0eb6e9ddd6ad.tar.gz linux-crypto-45ce5d915020b8c76238e123748e0eb6e9ddd6ad.zip | |
Merge tag 'v4.16-rc2' into next-general
Sync to Linux 4.16-rc2 for developers to work against.
Diffstat (limited to 'crypto/blkcipher.c')
| -rw-r--r-- | crypto/blkcipher.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index 6c43a0a1..01c0d4aa 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -18,7 +18,6 @@ #include <crypto/internal/skcipher.h> #include <crypto/scatterwalk.h> #include <linux/errno.h> -#include <linux/hardirq.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/seq_file.h> |