From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Oct 2019 16:37:01 +0000 (-0700)
Subject: Merge branch 'parisc-5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v5.15~5304
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=02755af0f322fd1d2d7995c1e9fd6f9668511560;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'parisc-5.4-2' of git://git./linux/kernel/git/deller/parisc-linux

Pull parisc fixes from Helge Deller:

 - Fix a parisc-specific fallout of Christoph's
   dma_set_mask_and_coherent() patches (Sven)

 - Fix a vmap memory leak in ioremap()/ioremap() (Helge)

 - Some minor cleanups and documentation updates (Nick, Helge)

* 'parisc-5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Remove 32-bit DMA enforcement from sba_iommu
  parisc: Fix vmap memory leak in ioremap()/iounmap()
  parisc: prefer __section from compiler_attributes.h
  parisc: sysctl.c: Use CONFIG_PARISC instead of __hppa_ define
  MAINTAINERS: Add hp_sdc drivers to parisc arch
---

02755af0f322fd1d2d7995c1e9fd6f9668511560