]> Git Repo - linux.git/commitdiff
Merge tag 'dmaengine-fix-5.1-rc3' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <[email protected]>
Sun, 31 Mar 2019 14:42:39 +0000 (07:42 -0700)
committerLinus Torvalds <[email protected]>
Sun, 31 Mar 2019 14:42:39 +0000 (07:42 -0700)
Pull dmaengine fixes from Vinod Koul:

 - Revert "dmaengine: stm32-mdma: Add a check on read_u32_array" as that
   caused regression

 - Fix MAINTAINER file uniphier-mdmac.c file path

* tag 'dmaengine-fix-5.1-rc3' of git://git.infradead.org/users/vkoul/slave-dma:
  MAINTAINERS: Fix uniphier-mdmac.c file path
  dmaengine: stm32-mdma: Revert "dmaengine: stm32-mdma: Add a check on read_u32_array"

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index 3e5a5d263f2992b77c4bbc884969af279513ee19,67e895feddc8bbd9ce8be96eb336ebc29d2a3b20..bfb15573465f4a4555ab147345fcd7b1831aecbe
@@@ -2356,7 -2356,7 +2356,7 @@@ F:      arch/arm/mm/cache-uniphier.
  F:    arch/arm64/boot/dts/socionext/uniphier*
  F:    drivers/bus/uniphier-system-bus.c
  F:    drivers/clk/uniphier/
- F:    drivers/dmaengine/uniphier-mdmac.c
+ F:    drivers/dma/uniphier-mdmac.c
  F:    drivers/gpio/gpio-uniphier.c
  F:    drivers/i2c/busses/i2c-uniphier*
  F:    drivers/irqchip/irq-uniphier-aidet.c
@@@ -8096,16 -8096,6 +8096,16 @@@ F:    include/linux/iommu.
  F:    include/linux/of_iommu.h
  F:    include/linux/iova.h
  
 +IO_URING
 +M:    Jens Axboe <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://git.kernel.dk/linux-block
 +T:    git git://git.kernel.dk/liburing
 +S:    Maintained
 +F:    fs/io_uring.c
 +F:    include/uapi/linux/io_uring.h
 +
  IP MASQUERADING
  M:    Juanjo Ciarlante <[email protected]>
  S:    Maintained
This page took 0.093859 seconds and 4 git commands to generate.