David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/renesas/ravb_main.c
	kernel/bpf/syscall.c
	net/ipv4/ipmr.c

All three conflicts were cases of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-12-03 21:09:12 -05:00

..

asymmetric_keys

X.509: Fix the time validation [ver #2]

2015-11-12 21:17:15 +11:00

async_tx

…

.gitignore

…

842.c

…

ablk_helper.c

…

ablkcipher.c

crypto: api - Only abort operations on fatal signal

2015-10-20 21:59:25 +08:00

aead.c

crypto: aead - Remove CRYPTO_ALG_AEAD_NEW flag

2015-08-17 16:53:53 +08:00

aes_generic.c

…

af_alg.c

…

ahash.c

crypto: ahash - ensure statesize is non-zero

2015-10-13 22:28:10 +08:00

akcipher.c

crypto: akcipher - Don't #include crypto/public_key.h as the contents aren't used

2015-10-20 22:14:01 +08:00

algapi.c

crypto: api - Only abort operations on fatal signal

2015-10-20 21:59:25 +08:00

algboss.c

crypto: algboss - Remove reference to nivaead

2015-08-17 16:53:41 +08:00

algif_aead.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-12-03 21:09:12 -05:00

algif_hash.c

crypto: algif_hash - Only export and import on sockets with data

2015-11-02 17:48:30 +08:00

algif_rng.c

…

algif_skcipher.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-12-03 21:09:12 -05:00

ansi_cprng.c

…

anubis.c

…

api.c

crypto: api - Only abort operations on fatal signal

2015-10-20 21:59:25 +08:00

arc4.c

…

authenc.c

crypto: aead - Remove CRYPTO_ALG_AEAD_NEW flag

2015-08-17 16:53:53 +08:00

authencesn.c

crypto: aead - Remove CRYPTO_ALG_AEAD_NEW flag

2015-08-17 16:53:53 +08:00

blkcipher.c

…

blowfish_common.c

…

blowfish_generic.c

…

camellia_generic.c

…

cast5_generic.c

…

cast6_generic.c

…

cast_common.c

…

cbc.c

…

ccm.c

crypto: replace scatterwalk_sg_chain with sg_chain

2015-08-17 08:12:54 -06:00

chacha20_generic.c

crypto: chacha20 - Export common ChaCha20 helpers

2015-07-17 21:20:21 +08:00

chacha20poly1305.c

crypto: aead - Remove CRYPTO_ALG_AEAD_NEW flag

2015-08-17 16:53:53 +08:00

chainiv.c

…

cipher.c

…

cmac.c

…

compress.c

…

crc32.c

…

crc32c_generic.c

…

crct10dif_common.c

…

crct10dif_generic.c

…

cryptd.c

crypto: aead - Remove CRYPTO_ALG_AEAD_NEW flag

2015-08-17 16:53:53 +08:00

crypto_null.c

…

crypto_user.c

crypto: api - Only abort operations on fatal signal

2015-10-20 21:59:25 +08:00

crypto_wq.c

…

ctr.c

…

cts.c

…

deflate.c

…

des_generic.c

…

drbg.c

…

ecb.c

…

echainiv.c

crypto: echainiv - Use generic geniv init/exit helpers

2015-08-17 16:53:46 +08:00

eseqiv.c

…

fcrypt.c

…

fips.c

…

gcm.c

Merge branch 'for-4.3/sg' of git://git.kernel.dk/linux-block

2015-09-02 13:22:38 -07:00

gf128mul.c

…

ghash-generic.c

…

hash_info.c

…

hmac.c

…

internal.h

…

jitterentropy-kcapi.c

crypto: jitterentropy - remove unnecessary information from a comment

2015-10-14 22:23:16 +08:00

jitterentropy.c

…

Kconfig

crypto: keywrap - enable compilation

2015-10-15 21:05:06 +08:00

keywrap.c

crypto: keywrap - add key wrapping block chaining mode

2015-10-15 21:05:04 +08:00

khazad.c

…

lrw.c

…

lz4.c

…

lz4hc.c

…

lzo.c

…

Makefile

crypto: keywrap - enable compilation

2015-10-15 21:05:06 +08:00

mcryptd.c

…

md4.c

…

md5.c

…

memneq.c

…

michael_mic.c

…

pcbc.c

…

pcompress.c

…

pcrypt.c

crypto: aead - Remove CRYPTO_ALG_AEAD_NEW flag

2015-08-17 16:53:53 +08:00

poly1305_generic.c

crypto: poly1305 - Export common Poly1305 helpers

2015-07-17 21:20:26 +08:00

proc.c

…

ripemd.h

…

rmd128.c

…

rmd160.c

…

rmd256.c

…

rmd320.c

…

rng.c

…

rsa_helper.c

crypto: akcipher - Changes to asymmetric key API

2015-10-14 22:23:16 +08:00

rsa.c

crypto: akcipher - Changes to asymmetric key API

2015-10-14 22:23:16 +08:00

rsaprivkey.asn1

crypto: akcipher - Changes to asymmetric key API

2015-10-14 22:23:16 +08:00

rsapubkey.asn1

crypto: akcipher - Changes to asymmetric key API

2015-10-14 22:23:16 +08:00

salsa20_generic.c

…

scatterwalk.c

…

seed.c

…

seqiv.c

crypto: seqiv - Use generic geniv init/exit helpers

2015-08-17 16:53:46 +08:00

serpent_generic.c

…

sha1_generic.c

…

sha256_generic.c

…

sha512_generic.c

…

shash.c

…

skcipher.c

crypto: skcipher - blkcipher and ablkcipher should it be static

2015-10-01 21:56:57 +08:00

tcrypt.c

crypto: tcrypt - avoid mapping from module image addresses

2015-09-21 22:00:36 +08:00

tcrypt.h

crypto: tcrypt - Add ChaCha20/Poly1305 speed tests

2015-07-17 21:20:20 +08:00

tea.c

…

testmgr.c

crypto: keywrap - add testmgr support

2015-10-15 21:05:08 +08:00

testmgr.h

crypto: keywrap - add testmgr support

2015-10-15 21:05:08 +08:00

tgr192.c

…

twofish_common.c

…

twofish_generic.c

…

vmac.c

…

wp512.c

…

xcbc.c

…

xor.c

…

xts.c

…

zlib.c

…