diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-15 08:31:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-15 08:31:21 -0700 |
| commit | 88f76bc31b93cc228f5a43d5b565dc53615970ae (patch) | |
| tree | fe991a0d047a4fa0c05ce59e0d95e7fb937a631a /MAINTAINERS | |
| parent | 89963adcdb430e047f4c03ac3ed6ce9aa42a595c (diff) | |
| parent | cbc22b062106993980df43a7ffa93351d3218844 (diff) | |
| download | linux-88f76bc31b93cc228f5a43d5b565dc53615970ae.tar.gz linux-88f76bc31b93cc228f5a43d5b565dc53615970ae.tar.bz2 linux-88f76bc31b93cc228f5a43d5b565dc53615970ae.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a number of issues in the chelsio and caam drivers"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
Revert "crypto: caam/jr - Remove extra memory barrier during job ring dequeue"
crypto: caam - fix caam_dump_sg that iterates through scatterlist
crypto: caam - fix DKP detection logic
MAINTAINERS: Maintainer for Chelsio crypto driver
crypto: chelsio - count incomplete block in IV
crypto: chelsio - Fix softlockup with heavy I/O
crypto: chelsio - Fix NULL pointer dereference
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ce573aaa04df..0d31d2b58d8c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4316,7 +4316,7 @@ F: drivers/infiniband/hw/cxgb3/ F: include/uapi/rdma/cxgb3-abi.h CXGB4 CRYPTO DRIVER (chcr) -M: Harsh Jain <harsh@chelsio.com> +M: Atul Gupta <atul.gupta@chelsio.com> L: linux-crypto@vger.kernel.org W: http://www.chelsio.com S: Supported |