]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e2ef660 507a989)
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Nov 2018 17:42:32 +0000 (09:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Nov 2018 17:42:32 +0000 (09:42 -0800)
commitf8bbb7691cd8bd343aba02f06a44d5779ebd1335
treeff576fb60ffbe6d3bcc325b217aef65e05c1331atree | snapshot
parente2ef660418cfff0b42ac72015a20fecad0464da1commit | diff
parent507a989c4a97f86ab5bd20f215f89ec9af7fe488commit | diff
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
Linux Kernel Source Tree.