Merge branch 'android-4.9-q' of https://android.googlesource.com/kernel/common into sos-3.x
-----
Merge list:
28d133950534 Merge 4.9.310 into android-4.9-q
6348ae07835a Linux 4.9.310
7815cbf19ac4 arm64: Use the clearbhb instruction in mitigations
9396d5ede3df arm64: add ID_AA64ISAR2_EL1 sys register
df0448480b9c KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated
4dd8aae585a5 arm64: Mitigate spectre style branch history side channels
094a410426b4 KVM: arm64: Add templates for BHB mitigation sequences
1451b7fe7a36 arm64: Add percpu vectors for EL1
aee10c2dd013 arm64: entry: Add macro for reading symbol addresses from the trampoline
218ddd9cb91e arm64: entry: Add vectors that have the bhb mitigation sequences
ac965734ce0f arm64: Move arm64_update_smccc_conduit() out of SSBD ifdef
944ecb18c729 arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations
bd69a09d7d22 arm64: entry: Allow the trampoline text to occupy multiple pages
1f7da613bf57 arm64: entry: Make the kpti trampoline's kpti sequence optional
283bcb8f640e arm64: entry: Move trampoline macros out of ifdef'd section
2ce6f5deed71 arm64: entry: Don't assume tramp_vectors is the start of the vectors
99cbe345732d arm64: entry: Allow tramp_alias to access symbols after the 4K boundary
ee04ed16acb6 arm64: entry: Move the trampoline data page before the text page
a212d166a9d7 arm64: entry: Free up another register on kpti's tramp_exit path
6835855140dc arm64: entry: Make the trampoline cleanup optional
0a59e9cf1f29 arm64: entry.S: Add ventry overflow sanity checks
f28446994a55 arm64: Add helper to decode register from instruction
670b93fd605d arm64: Add Cortex-X2 CPU part definition
1afa33de99dd arm64: Add Neoverse-N2, Cortex-A710 CPU part definition
718af13fd84c arm64: Add part number for Arm Cortex-A77
fee9d5888a90 arm64: Add part number for Neoverse N1
47efac06a277 arm64: Make ARM64_ERRATUM_1188873 depend on COMPAT
68a685e018ab arm64: Add silicon-errata.txt entry for ARM erratum 1188873
89a512adceab arm64: arch_timer: avoid unused function warning
501d9435c716 arm64: arch_timer: Add workaround for ARM erratum 1188873
ba072295630f arm64: arch_timer: Add erratum handler for CPU-specific capability
f4a88eb6b178 arm64: arch_timer: Add infrastructure for multiple erratum detection methods
7a48b35f0cd3 clocksource/drivers/arm_arch_timer: Introduce generic errata handling infrastructure
fda5a883b237 clocksource/drivers/arm_arch_timer: Remove fsl-a008585 parameter
c6815504d991 arm64: capabilities: Add support for checks based on a list of MIDRs
c771d4ceebfc arm64: Add helpers for checking CPU MIDR against a range
e531d7f7ae06 arm64: capabilities: Clean up midr range helpers
b49720bc6407 arm64: capabilities: Add flags to handle the conflicts on late CPU
3d108b78c2f5 arm64: capabilities: Prepare for fine grained capabilities
454f7ba3b36b arm64: capabilities: Move errata processing code
b63ccc3ae93e arm64: capabilities: Move errata work around check on boot CPU
3f74ad6849ff arm64: capabilities: Update prototype for enable call back
72c5ba547548 arm64: Add MIDR encoding for Arm Cortex-A55 and Cortex-A35
7f319f30e417 arm64: Remove useless UAO IPI and describe how this gets enabled
6e1ad7a49b2e arm64: errata: Provide macro for major and minor cpu revisions
-----
Change-Id: I79954229f5b8982f6ab90169395764df5b7187f4
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>