]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'arm64/for-next/fixes' into for-next/core
authorCatalin Marinas <catalin.marinas@arm.com>
Mon, 28 Oct 2019 14:57:16 +0000 (14:57 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Mon, 28 Oct 2019 15:30:52 +0000 (15:30 +0000)
commit58e05ebb129a4865651a913f3bfd8707b3093ddc
treefd4abf406de2d5519bd68626d7c26eca4e8bb5a1
parent1a1521bb50a95f9e476c2109d83bfa47e4706c56
parent878417554f8702b46c465f11360f9942269fe186
Merge remote-tracking branch 'arm64/for-next/fixes' into for-next/core

This is required to solve the conflicts with subsequent merges of two
more errata workaround branches.

* arm64/for-next/fixes:
  arm64: tags: Preserve tags for addresses translated via TTBR1
  arm64: mm: fix inverted PAR_EL1.F check
  arm64: sysreg: fix incorrect definition of SYS_PAR_EL1_F
  arm64: entry.S: Do not preempt from IRQ before all cpufeatures are enabled
  arm64: hibernate: check pgd table allocation
  arm64: cpufeature: Treat ID_AA64ZFR0_EL1 as RAZ when SVE is not enabled
  arm64: Fix kcore macros after 52-bit virtual addressing fallout
  arm64: Allow CAVIUM_TX2_ERRATUM_219 to be selected
  arm64: Avoid Cavium TX2 erratum 219 when switching TTBR
  arm64: Enable workaround for Cavium TX2 erratum 219 when running SMT
  arm64: KVM: Trap VM ops when ARM64_WORKAROUND_CAVIUM_TX2_219_TVM is set