summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSrinivasarao P <spathi@codeaurora.org>2019-11-20 12:08:40 +0530
committerSrinivasarao P <spathi@codeaurora.org>2019-11-20 12:09:34 +0530
commitacd0aacb7e54796116ea6964c17e8874376dbe34 (patch)
treee04df133c86b366b7596e1e58e32b4e3557bdf66 /Makefile
parent1c5aa324afccfea7716b594cc47bbc7be8aaab00 (diff)
parenta4d443b76f662953674703f370c312461b9b7b55 (diff)
Merge android-4.4-p.202 (a4d443b7) into msm-4.4
* refs/heads/tmp-a4d443b7 Linux 4.4.202 x86/bugs: Add ITLB_MULTIHIT bug infrastructure x86/speculation/taa: Fix printing of TAA_MSG_SMT on IBRS_ALL CPUs x86/tsx: Add config options to set tsx=on|off|auto x86/speculation/taa: Add documentation for TSX Async Abort x86/tsx: Add "auto" option to the tsx= cmdline parameter kvm/x86: Export MDS_NO=0 to guests when TSX is enabled x86/speculation/taa: Add sysfs reporting for TSX Async Abort x86/speculation/taa: Add mitigation for TSX Async Abort x86/cpu: Add a "tsx=" cmdline option with TSX disabled by default x86/cpu: Add a helper function x86_read_arch_cap_msr() x86/msr: Add the IA32_TSX_CTRL MSR KVM: x86: use Intel speculation bugs and features as derived in generic x86 code kvm: x86: IA32_ARCH_CAPABILITIES is always supported KVM: x86: Emulate MSR_IA32_ARCH_CAPABILITIES on AMD hosts KVM: Introduce kvm_get_arch_capabilities() powerpc/boot: Request no dynamic linker for boot wrapper powerpc: Fix compiling a BE kernel with a powerpc64le toolchain powerpc/Makefile: Use cflags-y/aflags-y for setting endian options MIPS: BCM63XX: fix switch core reset on BCM6368 kvm: mmu: Don't read PDPTEs when paging is not enabled Change-Id: I3a31ea51ed63a4ac72279a09d4bcba64868c803e Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 01df1410c2ce..09e872accf0e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 4
-SUBLEVEL = 201
+SUBLEVEL = 202
EXTRAVERSION =
NAME = Blurry Fish Butt