Commit f9dd2134374c8de6b911e2b8652c6c9622eaa658
Exists in
master
and in
7 other branches
Merge branch 'md-raid6-accel' into ioat3.2
Conflicts: include/linux/dmaengine.h
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 23 changed files Side-by-side Diff
- Documentation/crypto/async-tx-api.txt
- arch/arm/include/asm/hardware/iop3xx-adma.h
- arch/arm/mach-iop13xx/include/mach/adma.h
- arch/arm/mach-iop13xx/setup.c
- arch/arm/plat-iop/adma.c
- crypto/async_tx/Kconfig
- crypto/async_tx/Makefile
- crypto/async_tx/async_memcpy.c
- crypto/async_tx/async_memset.c
- crypto/async_tx/async_pq.c
- crypto/async_tx/async_raid6_recov.c
- crypto/async_tx/async_tx.c
- crypto/async_tx/async_xor.c
- crypto/async_tx/raid6test.c
- drivers/dma/Kconfig
- drivers/dma/dmaengine.c
- drivers/dma/dmatest.c
- drivers/dma/iop-adma.c
- drivers/md/Kconfig
- drivers/md/raid5.c
- drivers/md/raid5.h
- include/linux/async_tx.h
- include/linux/dmaengine.h