1. 10 Jun, 2020 3 commits
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-5.8-rc1' of git://git.infradead.org/users/vkoul/slave-dma · c90e7945
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
       "A fairly small dmaengine update which includes mostly driver updates
        (dmatest, dw-edma, ioat, mmp-tdma and k3-udma) along with Renesas
        binding update to json-schema"
      
      * tag 'dmaengine-5.8-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (39 commits)
        dmaengine: imx-sdma: initialize all script addresses
        dmaengine: ti: k3-udma: Use proper return code in alloc_chan_resources
        dmaengine: ti: k3-udma: Remove udma_chan.in_ring_cnt
        dmaengine: ti: k3-udma: Add missing dma_sync call for rx flush descriptor
        dmaengine: at_xdmac: Replace zero-length array with flexible-array
        dmaengine: at_hdmac: Replace zero-length array with flexible-array
        dmaengine: qcom: bam_dma: Replace zero-length array with flexible-array
        dmaengine: ti: k3-udma: Use PTR_ERR_OR_ZERO() to simplify code
        dmaengine: moxart-dma: Drop pointless static qualifier in moxart_probe()
        dmaengine: sf-pdma: Simplify the error handling path in 'sf_pdma_probe()'
        dmaengine: qcom_hidma: use true,false for bool variable
        dmaengine: dw-edma: support local dma device transfer semantics
        dmaengine: Fix doc strings to satisfy validation script
        dmaengine: Include dmaengine.h into dmaengine.c
        dmaengine: dmatest: Describe members of struct dmatest_info
        dmaengine: dmatest: Describe members of struct dmatest_params
        dmaengine: dmatest: Allow negative timeout value to specify infinite wait
        Revert "dmaengine: dmatest: timeout value of -1 should specify infinite wait"
        dmaengine: stm32-dma: direct mode support through device tree
        dt-bindings: dma: add direct mode support through device tree in stm32-dma
        ...
      c90e7945
    • Geert Uytterhoeven's avatar
      Documentation/CodingStyle: Fix duplicate "are" typo · 77d22a43
      Geert Uytterhoeven authored
      The improved paragraph about line lengths contains a sentence with a
      duplicate word: there is one "are" at the end of a line, followed by a
      second one at the beginning of the next line.
      
      Drop the first one, as that one is part of the longest line.
      
      Fixes: bdc48fa1 ("checkpatch/coding-style: deprecate 80-column warning")
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      77d22a43
    • Andrew Morton's avatar
      arch/sparc/mm/srmmu.c: fix build · f7579007
      Andrew Morton authored
      "mm: consolidate pte_index() and pte_offset_*() definitions" was supposed
      to remove arch/sparc/mm/srmmu.c:pte_offset_kernel().
      
      Fixes: 974b9b2c ("mm: consolidate pte_index() and pte_offset_*() definitions")
      Reported-by: default avatarkernel test robot <lkp@intel.com>
      Cc: Mike Rapoport <rppt@linux.ibm.com>
      Cc: Johannes Weiner <hannes@cmpxchg.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f7579007
  2. 09 Jun, 2020 37 commits