Linus Torvalds
70477371dc
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 ...
Pull crypto update from Herbert Xu:
"Here is the crypto update for 4.6:
API:
- Convert remaining crypto_hash users to shash or ahash, also convert
blkcipher/ablkcipher users to skcipher.
- Remove crypto_hash interface.
- Remove crypto_pcomp interface.
- Add crypto engine for async cipher drivers.
- Add akcipher documentation.
- Add skcipher documentation.
Algorithms:
- Rename crypto/crc32 to avoid name clash with lib/crc32.
- Fix bug in keywrap where we zero the wrong pointer.
Drivers:
- Support T5/M5, T7/M7 SPARC CPUs in n2 hwrng driver.
- Add PIC32 hwrng driver.
- Support BCM6368 in bcm63xx hwrng driver.
- Pack structs for 32-bit compat users in qat.
- Use crypto engine in omap-aes.
- Add support for sama5d2x SoCs in atmel-sha.
- Make atmel-sha available again.
- Make sahara hashing available again.
- Make ccp hashing available again.
- Make sha1-mb available again.
- Add support for multiple devices in ccp.
- Improve DMA performance in caam.
- Add hashing support to rockchip"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (116 commits)
crypto: qat - remove redundant arbiter configuration
crypto: ux500 - fix checks of error code returned by devm_ioremap_resource()
crypto: atmel - fix checks of error code returned by devm_ioremap_resource()
crypto: qat - Change the definition of icp_qat_uof_regtype
hwrng: exynos - use __maybe_unused to hide pm functions
crypto: ccp - Add abstraction for device-specific calls
crypto: ccp - CCP versioning support
crypto: ccp - Support for multiple CCPs
crypto: ccp - Remove check for x86 family and model
crypto: ccp - memset request context to zero during import
lib/mpi: use "static inline" instead of "extern inline"
lib/mpi: avoid assembler warning
hwrng: bcm63xx - fix non device tree compatibility
crypto: testmgr - allow rfc3686 aes-ctr variants in fips mode.
crypto: qat - The AE id should be less than the maximal AE number
lib/mpi: Endianness fix
crypto: rockchip - add hash support for crypto engine in rk3288
crypto: xts - fix compile errors
crypto: doc - add skcipher API documentation
crypto: doc - update AEAD AD handling
...
2016-03-17 11:22:54 -07:00
Merge branch 'for-4.5/drivers' of git://git.kernel.dk/linux-block
2016-01-21 18:19:38 -08:00
dm space map metadata: remove unused variable in brb_pop()
2015-12-14 09:26:01 -05:00
md-cluster: delete useless code
2016-01-24 18:13:37 -08:00
md-cluster: Use a small window for resync
2015-10-12 01:32:05 -05:00
block: add a bi_error field to struct bio
2015-07-29 08:55:15 -06:00
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-01-12 17:11:47 -08:00
dm cache: make sure every metadata function checks fail_io
2016-03-10 17:12:12 -05:00
dm cache: make sure every metadata function checks fail_io
2016-03-10 17:12:12 -05:00
- Revert a dm-multipath change that caused a regression for unprivledged
2015-11-04 21:19:53 -08:00
dm cache policy smq: clarify that mq registration failure was for 'mq'
2016-03-10 17:12:11 -05:00
dm cache: bump the target version
2016-03-10 17:12:12 -05:00
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2016-03-17 11:22:54 -07:00
dm: rename target's per_bio_data_size to per_io_data_size
2016-02-22 22:34:37 -05:00
dm persistent data: eliminate unnecessary return values
2015-10-31 19:06:02 -04:00
- Revert a dm-multipath change that caused a regression for unprivledged
2015-11-04 21:19:53 -08:00
dm snapshot: fix hung bios when copy error occurs
2016-01-08 20:03:05 -05:00
dm: rename target's per_bio_data_size to per_io_data_size
2016-02-22 22:34:37 -05:00
md: more open-coded offset_in_page()
2016-01-04 10:29:12 -05:00
dm: allow immutable request-based targets to use blk-mq pdu
2016-02-22 22:34:37 -05:00
mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd
2015-11-06 17:50:42 -08:00
dm linear: remove redundant target name from error messages
2015-10-31 19:06:03 -04:00
dm: drop NULL test before kmem_cache_destroy() and mempool_destroy()
2015-10-31 19:06:00 -04:00
dm: rename target's per_bio_data_size to per_io_data_size
2016-02-22 22:34:37 -05:00
dm mpath: cleanup reinstate_path() et al based on code review
2016-03-10 17:12:04 -05:00
dm path selector: remove 'repeat_count' return from .select_path hook
2016-02-22 22:34:42 -05:00
dm path selector: remove 'repeat_count' return from .select_path hook
2016-02-22 22:34:42 -05:00
dm raid: fix round up of default region size
2015-10-02 12:02:31 -04:00
dm: rename target's per_bio_data_size to per_io_data_size
2016-02-22 22:34:37 -05:00
dm: convert ffs to __ffs
2015-10-31 19:06:01 -04:00
dm round robin: use percpu 'repeat_count' and 'current_path'
2016-02-22 22:34:42 -05:00
dm path selector: remove 'repeat_count' return from .select_path hook
2016-02-22 22:34:42 -05:00
dm snapshot: fix hung bios when copy error occurs
2016-01-08 20:03:05 -05:00
dm snapshot: fix hung bios when copy error occurs
2016-01-08 20:03:05 -05:00
dm snapshot: disallow the COW and origin devices from being identical
2016-03-10 17:12:09 -05:00
dm stats: report precise_timestamps and histogram in @stats_list output
2015-08-18 17:20:03 -04:00
dm stats: support precise timestamps
2015-06-17 12:40:40 -04:00
Merge tag 'dm-4.3-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm
2015-09-02 16:35:26 -07:00
dm switch: simplify conditional in alloc_region_table()
2015-10-31 19:06:06 -04:00
dm snapshot: disallow the COW and origin devices from being identical
2016-03-10 17:12:09 -05:00
dm: set DM_TARGET_WILDCARD feature on "error" target
2016-02-22 11:06:21 -05:00
dm thin metadata: don't issue prefetches if a transaction abort has failed
2016-03-10 17:12:09 -05:00
dm thin: consistently return -ENOSPC if pool has run out of data space
2016-03-11 16:15:22 -05:00
dm: rename target's per_bio_data_size to per_io_data_size
2016-02-22 22:34:37 -05:00
dm verity: add support for forward error correction
2015-12-10 10:39:03 -05:00
dm: rename target's per_bio_data_size to per_io_data_size
2016-02-22 22:34:37 -05:00
dm verity: add ignore_zero_blocks feature
2015-12-10 10:39:03 -05:00
block: add a bi_error field to struct bio
2015-07-29 08:55:15 -06:00
dm: fix rq_end_stats() NULL pointer in dm_requeue_original_request()
2016-03-14 17:04:34 -04:00
dm: allow immutable request-based targets to use blk-mq pdu
2016-02-22 22:34:37 -05:00
MD: rename some functions
2016-01-20 13:52:20 -08:00
dm: add missing newline between DM_DEBUG_BLOCK_STACK_TRACING and DM_BUFIO
2016-03-10 17:12:11 -05:00
block: kill merge_bvec_fn() completely
2015-08-13 12:31:57 -06:00
dm cache: make the 'mq' policy an alias for 'smq'
2016-03-10 17:12:08 -05:00
md-cluster: fix missing memory free
2016-01-24 18:13:18 -08:00
md-cluster: append some actions when change bitmap from clustered to none
2016-01-06 11:38:57 +11:00
md updates for 4.5
2016-01-15 12:28:00 -08:00
md updates for 4.5
2016-01-15 12:28:00 -08:00
md/raid: only permit hot-add of compatible integrity profiles
2016-01-14 11:49:57 +11:00
treewide: Fix typos in printk
2015-12-08 14:59:19 +01:00
block: kill merge_bvec_fn() completely
2015-08-13 12:31:57 -06:00
MD: rename some functions
2016-01-20 13:52:20 -08:00
md-cluster: Use a small window for resync
2015-10-12 01:32:05 -05:00
raid5-cache: handle journal hotadd in quiesce
2016-01-14 11:49:43 +11:00
MD: rename some functions
2016-01-20 13:52:20 -08:00
raid5-cache: IO error handling
2015-11-01 13:48:29 +11:00
MD: rename some functions
2016-01-20 13:52:20 -08:00
md/raid10: ensure device failure recorded before write request returns.
2015-08-31 19:43:45 +02:00
70477371dc