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

Commit 1c01b610 authored by Harsh Shah's avatar Harsh Shah Committed by Gerrit - the friendly Code Review server
Browse files

Merge "DOWNSTREAM commit 'b2e08d22' AU390... 

Merge "DOWNSTREAM commit 'b2e08d22' AU390 11/19" into dev/msm-4.14-camx
parents 09a59fbd 5d8f4981

AndroidKernel.mk

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ TARGET_KERNEL_CROSS_COMPILE_PREFIX := $(strip $(TARGET_KERNEL_CROSS_COMPILE_PREF 
ifeq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX),)

KERNEL_CROSS_COMPILE := arm-eabi-

else

KERNEL_CROSS_COMPILE := $(TARGET_KERNEL_CROSS_COMPILE_PREFIX)

KERNEL_CROSS_COMPILE := $(shell pwd)/$(TARGET_TOOLS_PREFIX)

endif



ifeq ($(KERNEL_LLVM_SUPPORT), true)
@@ -56,11 +56,11 @@ ifeq ($(KERNEL_LLVM_SUPPORT), true) 
    ifeq ($(shell echo $(SDCLANG_PATH) | head -c 1),/)

       KERNEL_LLVM_BIN := $(SDCLANG_PATH)/clang

    else

       KERNEL_LLVM_BIN := $(ANDROID_BUILD_TOP)/$(SDCLANG_PATH)/clang

       KERNEL_LLVM_BIN := $(shell pwd)/$(SDCLANG_PATH)/clang

    endif

    $(warning "Using sdllvm" $(KERNEL_LLVM_BIN))

  else

     KERNEL_LLVM_BIN := $(ANDROID_BUILD_TOP)/$(CLANG) #Using aosp-llvm compiler

     KERNEL_LLVM_BIN := $(shell pwd)/$(CLANG) #Using aosp-llvm compiler

    $(warning "Using aosp-llvm" $(KERNEL_LLVM_BIN))

  endif

endif

Documentation/ABI/testing/sysfs-block-zram

+10 −0
Original line number Diff line number Diff line
@@ -98,3 +98,13 @@ Description: 
		The backing_dev file is read-write and set up backing

		device for zram to write incompressible pages.

		For using, user should enable CONFIG_ZRAM_WRITEBACK.



What:		/sys/block/zram<id>/use_dedup

Date:		March 2017

Contact:	Joonsoo Kim <iamjoonsoo.kim@lge.com>

Description:

		The use_dedup file is read-write and specifies deduplication

		feature is used or not. If enabled, duplicated data is

		managed by reference count and will not be stored in memory

		twice. Benefit of this feature largely depends on the workload

		so keep attention when use.

Documentation/ABI/testing/sysfs-devices-system-cpu

+24 −0
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ What: /sys/devices/system/cpu/vulnerabilities 
		/sys/devices/system/cpu/vulnerabilities/spectre_v1

		/sys/devices/system/cpu/vulnerabilities/spectre_v2

		/sys/devices/system/cpu/vulnerabilities/spec_store_bypass

		/sys/devices/system/cpu/vulnerabilities/l1tf

Date:		January 2018

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Information about CPU vulnerabilities
@@ -390,3 +391,26 @@ Description: Information about CPU vulnerabilities 
		"Not affected"	  CPU is not affected by the vulnerability

		"Vulnerable"	  CPU is affected and no mitigation in effect

		"Mitigation: $M"  CPU is affected and mitigation $M is in effect



		Details about the l1tf file can be found in

		Documentation/admin-guide/l1tf.rst



What:		/sys/devices/system/cpu/smt

		/sys/devices/system/cpu/smt/active

		/sys/devices/system/cpu/smt/control

Date:		June 2018

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Control Symetric Multi Threading (SMT)



		active:  Tells whether SMT is active (enabled and siblings online)



		control: Read/write interface to control SMT. Possible

			 values:



			 "on"		SMT is enabled

			 "off"		SMT is disabled

			 "forceoff"	SMT is force disabled. Cannot be changed.

			 "notsupported" SMT is not supported by the CPU



			 If control status is "forceoff" or "notsupported" writes

			 are rejected.

Documentation/ABI/testing/sysfs-fs-f2fs

+8 −0
Original line number Diff line number Diff line
@@ -51,6 +51,14 @@ Description: 
		 Controls the dirty page count condition for the in-place-update

		 policies.



What:		/sys/fs/f2fs/<disk>/min_seq_blocks

Date:		August 2018

Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:

		 Controls the dirty page count condition for batched sequential

		 writes in ->writepages.





What:		/sys/fs/f2fs/<disk>/min_hot_blocks

Date:		March 2017

Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Documentation/admin-guide/index.rst

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,15 @@ etc. 
   kernel-parameters

   devices



This section describes CPU vulnerabilities and provides an overview of the

possible mitigations along with guidance for selecting mitigations if they

are configurable at compile, boot or run time.



.. toctree::

   :maxdepth: 1



   l1tf



Here is a set of documents aimed at users who are trying to track down

problems and bugs in particular.