From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 24 Nov 2018 17:42:32 +0000 (-0800)
Subject: Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
X-Git-Tag: v4.20-rc4~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d146194f31c96f9b260c5a1cf1592d2e7f82a2e2;p=thirdparty%2Fkernel%2Flinux.git

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

Pull arm64 fixes from Catalin Marinas::

 - Fix wrong conflict resolution around CONFIG_ARM64_SSBD

 - Fix sparse warning on unsigned long constant

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block
  arm64: sysreg: fix sparse warnings
---

d146194f31c96f9b260c5a1cf1592d2e7f82a2e2