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

Commit 5a8d108c authored Jan 25, 2023 by Treehugger Robot

Merge "Merge tag 'android11-5.4.226_r00' into android11-5.4" into android11-5.4

parents c429b235 98d86001

Documentation/ABI/testing/sysfs-bus-iio

+1 −1

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@ Description:
		Raw capacitance measurement from channel Y. Units after
		application of scale and offset are nanofarads.

		What: /sys/.../iio:deviceX/in_capacitanceY-in_capacitanceZ_raw
		What: /sys/.../iio:deviceX/in_capacitanceY-capacitanceZ_raw
		KernelVersion: 3.2
		Contact: linux-iio@vger.kernel.org
		Description:

Documentation/arm64/silicon-errata.rst

+4 −0

Original line number	Diff line number	Diff line
		@@ -70,8 +70,12 @@ stable kernels.
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A57 \| #834220 \| ARM64_ERRATUM_834220 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A57 \| #1742098 \| ARM64_ERRATUM_1742098 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A72 \| #853709 \| N/A \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A72 \| #1655431 \| ARM64_ERRATUM_1742098 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A73 \| #858921 \| ARM64_ERRATUM_858921 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| ARM \| Cortex-A55 \| #1024718 \| ARM64_ERRATUM_1024718 \|

Documentation/process/code-of-conduct-interpretation.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ the Technical Advisory Board (TAB) or other maintainers if you're
		uncertain how to handle situations that come up. It will not be
		considered a violation report unless you want it to be. If you are
		uncertain about approaching the TAB or any other maintainers, please
		reach out to our conflict mediator, Joanna Lee <joanna.lee@gesmer.com>.
		reach out to our conflict mediator, Joanna Lee <jlee@linuxfoundation.org>.

		In the end, "be kind to each other" is really what the end goal is for
		everybody. We know everyone is human and we all fail at times, but the

Documentation/trace/histogram.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ Documentation written by Tom Zanussi
		will use the event's kernel stacktrace as the key. The keywords
		'keys' or 'key' can be used to specify keys, and the keywords
		'values', 'vals', or 'val' can be used to specify values. Compound
		keys consisting of up to two fields can be specified by the 'keys'
		keys consisting of up to three fields can be specified by the 'keys'
		keyword. Hashing a compound key produces a unique entry in the
		table for each unique combination of component keys, and can be
		useful for providing more fine-grained summaries of event data.

Makefile

+4 −2

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 5
		PATCHLEVEL = 4
		SUBLEVEL = 219
		SUBLEVEL = 226
		EXTRAVERSION =
		NAME = Kleptomaniac Octopus

		@@ -825,7 +825,9 @@ DEBUG_CFLAGS += -gsplit-dwarf
		else
		DEBUG_CFLAGS += -g
		endif
		ifneq ($(LLVM_IAS),1)
		ifeq ($(LLVM_IAS),1)
		KBUILD_AFLAGS += -g
		else
		KBUILD_AFLAGS += -Wa,-gdwarf-2
		endif
		endif