From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jul 2018 00:29:08 +0000 (-0700)
Subject: Merge tag 'dmaengine-fix-4.18-rc4' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v4.19~653
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=89ac2233d34dcf87854ad48d638d1a86db3f6bd2;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'dmaengine-fix-4.18-rc4' of git://git.infradead.org/users/vkoul/slave-dma

Pull dmaengine fixes from Vinod Koul:
 "We have few odd driver fixes and one email update change for you this
  time:

   - Driver fixes for k3dma (off by one), pl330 (burst residue
     granularity) and omap-dma (incorrect residue_granularity)

   - Sinan's email update"

* tag 'dmaengine-fix-4.18-rc4' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: k3dma: Off by one in k3_of_dma_simple_xlate()
  dmaengine: pl330: report BURST residue granularity
  MAINTAINERS: Update email-id of Sinan Kaya
  dmaengine: ti: omap-dma: Fix OMAP1510 incorrect residue_granularity
---

89ac2233d34dcf87854ad48d638d1a86db3f6bd2