From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 12 Dec 2015 18:16:26 +0000 (-0800)
Subject: Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
X-Git-Tag: firefly_0821_release~176^2~576
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6539756e68bf8fab1dfc08bddf00d9fbba8c071f;p=firefly-linux-kernel-4.4.55.git

Merge tag 'arm64-fixes' of git://git./linux/kernel/git/arm64/linux

Pull arm64 fixes from Catalin Marinas:

 - Update the linker script to use L1_CACHE_BYTES instead of hard-coded
   64.  We recently changed L1_CACHE_BYTES to 128

 - Improve race condition reporting on set_pte_at() and change the BUG
   to WARN_ONCE.  With hardware update of the accessed/dirty state, we
   need to ensure that set_pte_at() does not inadvertently override
   hardware updated state.  The patch also makes the checks ignore
   !pte_valid() new entries

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: Improve error reporting on set_pte_at() checks
  arm64: update linker script to increased L1_CACHE_BYTES value
---

6539756e68bf8fab1dfc08bddf00d9fbba8c071f