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

Conflicts:
	drivers/net/phy/amd-xgbe-phy.c
	drivers/net/wireless/iwlwifi/Kconfig
	include/net/mac80211.h

iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.

The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.

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

2015-06-01 22:51:30 -07:00

..

asymmetric_keys

…

async_tx

md/raid5: activate raid6 rmw feature

2015-04-22 08:00:42 +10:00

842.c

…

ablk_helper.c

crypto: cryptd - process CRYPTO_ALG_INTERNAL

2015-03-31 21:21:04 +08:00

ablkcipher.c

crypto: replace scatterwalk_sg_next with sg_next

2015-01-26 11:34:22 +11:00

aead.c

crypto: aead - fixed style error in aead.c

2014-12-22 23:02:35 +11:00

aes_generic.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

af_alg.c

net: Pass kern from net_proto_family.create to sk_alloc

2015-05-11 10:50:17 -04:00

ahash.c

crypto: replace scatterwalk_sg_next with sg_next

2015-01-26 11:34:22 +11:00

algapi.c

crypto: fix broken crypto_register_instance() module handling

2015-04-15 20:26:16 -07:00

algboss.c

…

algif_aead.c

crypto: algif_aead - fix invalid sgl linking

2015-05-18 12:13:06 +08:00

algif_hash.c

new helper: msg_data_left()

2015-04-11 15:53:35 -04:00

algif_rng.c

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

2015-04-15 10:42:15 -07:00

algif_skcipher.c

new helper: msg_data_left()

2015-04-11 15:53:35 -04:00

ansi_cprng.c

crypto: rng - RNGs must return 0 in success case

2015-03-09 21:06:18 +11:00

anubis.c

…

api.c

crypto: api - prevent helper ciphers from being used

2015-03-31 21:21:03 +08:00

arc4.c

…

authenc.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

authencesn.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

blkcipher.c

…

blowfish_common.c

…

blowfish_generic.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

camellia_generic.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

cast5_generic.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

cast6_generic.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

cast_common.c

…

cbc.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

ccm.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

chainiv.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

cipher.c

…

cmac.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

compress.c

…

crc32.c

…

crc32c_generic.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

crct10dif_common.c

…

crct10dif_generic.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

cryptd.c

crypto: cryptd - process CRYPTO_ALG_INTERNAL

2015-03-31 21:21:04 +08:00

crypto_null.c

…

crypto_user.c

crypto: user - Fix crypto_alg_match race

2015-04-08 22:20:06 +08:00

crypto_wq.c

…

ctr.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

cts.c

crypto: cts - Weed out non-CBC algorithms

2015-01-20 14:44:15 +11:00

deflate.c

…

des_generic.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

drbg.c

crypto: rng - RNGs must return 0 in success case

2015-03-09 21:06:18 +11:00

ecb.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

eseqiv.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

fcrypt.c

…

fips.c

…

gcm.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

gf128mul.c

…

ghash-generic.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

hash_info.c

…

hmac.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

internal.h

…

Kconfig

crypto: algif_aead - Disable AEAD user-space for now

2015-05-26 15:51:45 +08:00

khazad.c

…

krng.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

lrw.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

lz4.c

…

lz4hc.c

…

lzo.c

…

Makefile

crypto: algif - enable AEAD interface compilation

2015-03-04 22:12:39 +13:00

mcryptd.c

crypto: mcryptd - process CRYPTO_ALG_INTERNAL

2015-03-31 21:21:13 +08:00

md4.c

…

md5.c

…

memneq.c

…

michael_mic.c

…

pcbc.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

pcompress.c

…

pcrypt.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

proc.c

crypto: proc - identify internal ciphers

2015-03-31 21:21:04 +08:00

ripemd.h

…

rmd128.c

…

rmd160.c

…

rmd256.c

…

rmd320.c

…

rng.c

…

salsa20_generic.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

scatterwalk.c

crypto: replace scatterwalk_sg_next with sg_next

2015-01-26 11:34:22 +11:00

seed.c

…

seqiv.c

crypto: seqiv - Ensure that IV size is at least 8 bytes

2015-01-20 14:44:16 +11:00

serpent_generic.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

sha1_generic.c

crypto: sha1-generic - move to generic glue implementation

2015-04-10 21:39:40 +08:00

sha256_generic.c

crypto: sha256-generic - move to generic glue implementation

2015-04-10 21:39:41 +08:00

sha512_generic.c

crypto: sha512-generic - move to generic glue implementation

2015-04-10 21:39:41 +08:00

shash.c

…

tcrypt.c

crypto: tcrypt - fix uninit sg entries in test_acipher_speed

2015-03-12 01:11:05 +11:00

tcrypt.h

…

tea.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

testmgr.c

crypto: testmgr - use CRYPTO_ALG_INTERNAL

2015-03-31 21:21:03 +08:00

testmgr.h

…

tgr192.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

twofish_common.c

…

twofish_generic.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

vmac.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

wp512.c

crypto: add missing crypto module aliases

2015-01-13 22:29:11 +11:00

xcbc.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

xor.c

…

xts.c

crypto: include crypto- module prefix in template

2014-11-26 20:06:30 +08:00

zlib.c

…