Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6a2356f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.19-q.79 (40321f25) into msm-4.19"

parents ff20c146 63399e39

Documentation/admin-guide/kernel-parameters.txt

+9 −7
Original line number Diff line number Diff line
@@ -2510,8 +2510,8 @@ 
			http://repo.or.cz/w/linux-2.6/mini2440.git



	mitigations=

			[X86,PPC,S390] Control optional mitigations for CPU

			vulnerabilities.  This is a set of curated,

			[X86,PPC,S390,ARM64] Control optional mitigations for

			CPU vulnerabilities.  This is a set of curated,

			arch-independent options, each of which is an

			aggregation of existing arch-specific options.
@@ -2520,12 +2520,14 @@ 
				improves system performance, but it may also

				expose users to several CPU vulnerabilities.

				Equivalent to: nopti [X86,PPC]

					       kpti=0 [ARM64]

					       nospectre_v1 [PPC]

					       nobp=0 [S390]

					       nospectre_v1 [X86]

					       nospectre_v2 [X86,PPC,S390]

					       nospectre_v2 [X86,PPC,S390,ARM64]

					       spectre_v2_user=off [X86]

					       spec_store_bypass_disable=off [X86,PPC]

					       ssbd=force-off [ARM64]

					       l1tf=off [X86]

					       mds=off [X86]
@@ -2873,10 +2875,10 @@ 
			(bounds check bypass). With this option data leaks

			are possible in the system.



	nospectre_v2	[X86,PPC_FSL_BOOK3E] Disable all mitigations for the Spectre variant 2

			(indirect branch prediction) vulnerability. System may

			allow data leaks with this option, which is equivalent

			to spectre_v2=off.

	nospectre_v2	[X86,PPC_FSL_BOOK3E,ARM64] Disable all mitigations for

			the Spectre variant 2 (indirect branch prediction)

			vulnerability. System may allow data leaks with this

			option.



	nospec_store_bypass_disable

			[HW] Disable all mitigations for the Speculative Store Bypass vulnerability

Documentation/arm64/elf_hwcaps.txt

+4 −0
Original line number Diff line number Diff line
@@ -178,3 +178,7 @@ HWCAP_ILRCPC 
HWCAP_FLAGM



    Functionality implied by ID_AA64ISAR0_EL1.TS == 0b0001.



HWCAP_SSBS



    Functionality implied by ID_AA64PFR1_EL1.SSBS == 0b0010.

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 78

SUBLEVEL = 79

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ config ARM64 
	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS_BROADCAST

	select GENERIC_CPU_AUTOPROBE

	select GENERIC_CPU_VULNERABILITIES

	select GENERIC_EARLY_IOREMAP

	select GENERIC_IDLE_POLL_SETUP

	select GENERIC_IRQ_MULTI_HANDLER

arch/arm64/configs/cuttlefish_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ CONFIG_SGETMASK_SYSCALL=y 
# CONFIG_FHANDLE is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_BPF_SYSCALL=y

CONFIG_BPF_JIT_ALWAYS_ON=y

# CONFIG_RSEQ is not set

CONFIG_EMBEDDED=y

# CONFIG_VM_EVENT_COUNTERS is not set
@@ -191,6 +192,7 @@ CONFIG_NET_EMATCH_U32=y 
CONFIG_NET_CLS_ACT=y

CONFIG_VSOCKETS=y

CONFIG_VIRTIO_VSOCKETS=y

CONFIG_BPF_JIT=y

CONFIG_CFG80211=y

# CONFIG_CFG80211_DEFAULT_PS is not set

# CONFIG_CFG80211_CRDA_SUPPORT is not set