diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-24 09:53:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-24 09:53:12 -0700 |
| commit | c6ac7188c1142c450eb601563ad69204bf1e9286 (patch) | |
| tree | 29fc76466420afc8d5f50987c653157b2336df4f /MAINTAINERS | |
| parent | 979e52ca0469fb38646bc51d26a0263a740c9f03 (diff) | |
| parent | 018af9be3dd54e6f24f828966bdd873f4d63ad9b (diff) | |
| download | linux-c6ac7188c1142c450eb601563ad69204bf1e9286.tar.gz | |
Merge tag 'dmaengine-fix-5.6' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul: "Late fixes in dmaengine for v5.6: - move .device_release missing log warning to debug - couple of maintainer entries for HiSilicon and IADX drivers - off-by-one fix for idxd driver - documentation warning fixes - TI k3 dma error handling fix" * tag 'dmaengine-fix-5.6' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: ti: k3-udma-glue: Fix an error handling path in 'k3_udma_glue_cfg_rx_flow()' MAINTAINERS: Add maintainer for HiSilicon DMA engine driver dmaengine: idxd: fix off by one on cdev dwq refcount MAINTAINERS: rectify the INTEL IADX DRIVER entry dmaengine: move .device_release missing log warning to debug level docs: dmaengine: provider.rst: get rid of some warnings
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cc1d18cb5d18..110678d9698b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7516,6 +7516,12 @@ F: include/uapi/linux/if_hippi.h F: net/802/hippi.c F: drivers/net/hippi/ +HISILICON DMA DRIVER +M: Zhou Wang <wangzhou1@hisilicon.com> +L: dmaengine@vger.kernel.org +S: Maintained +F: drivers/dma/hisi_dma.c + HISILICON SECURITY ENGINE V2 DRIVER (SEC2) M: Zaibo Xu <xuzaibo@huawei.com> L: linux-crypto@vger.kernel.org @@ -8476,7 +8482,6 @@ L: dmaengine@vger.kernel.org S: Supported F: drivers/dma/idxd/* F: include/uapi/linux/idxd.h -F: include/linux/idxd.h INTEL IDLE DRIVER M: Jacob Pan <jacob.jun.pan@linux.intel.com> |