From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 17 Feb 2019 16:34:10 +0000 (-0800)
Subject: Merge tag 'csky-for-linus-5.0-rc6' of git://github.com/c-sky/csky-linux
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0513ebc33ed6b590bfbaaf21cd7b3d571c20edb9;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'csky-for-linus-5.0-rc6' of git://github.com/c-sky/csky-linux

Pull arch/csky fixes from Guo Ren:
 "Here are some fixup patches for 5.0-rc6"

* tag 'csky-for-linus-5.0-rc6' of git://github.com/c-sky/csky-linux:
  csky: Fixup dead loop in show_stack
  csky: Fixup io-range page attribute for mmap("/dev/mem")
  csky: coding convention: Use task_stack_page
  csky: Fixup wrong pt_regs size
  csky: Fixup _PAGE_GLOBAL bit for 610 tlb entry
---

0513ebc33ed6b590bfbaaf21cd7b3d571c20edb9