From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Mar 2019 17:18:43 +0000 (-0800)
Subject: Merge tag 'asm-generic-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fa29f5ba42404b44aceb1a63ff4757efe5cd1789;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'asm-generic-5.1' of git://git./linux/kernel/git/arnd/asm-generic

Pull asm-generic updates from Arnd Bergmann:
 "Only a few small changes this time:

   - Michael S. Tsirkin cleans up linux/mman.h

   - Mike Rapoport found a typo

  I had originally merged another cleanup series for I/O accessors from
  Hugo Lefeuvre as well, but dropped it after the discussion of the
  barrier semantics and some conflicts. I expect this series to get
  merged for a later release though"

* tag 'asm-generic-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic/page.h: fix typo in #error text requiring a real asm/page.h
  arch: move common mmap flags to linux/mman.h
  drm: tweak header name
  x86/mpx: tweak header name
---

fa29f5ba42404b44aceb1a63ff4757efe5cd1789