Commit b3c39b1a authored Nov 20, 2022 by Arnaldo Carvalho de Melo

Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up fixes and check if libraries used that comes from other trees
continue to work with tools/perf, such as tools/lib/bpf.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parents 63a3bf5e 77c51ba5

.mailmap

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -416,6 +416,7 @@ TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
	TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>		TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
	Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
	Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>		Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
			Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
	Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
	Uwe Kleine-König <u.kleine-koenig@pengutronix.de>		Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
	Uwe Kleine-König <ukleinek@strlen.de>		Uwe Kleine-König <ukleinek@strlen.de>

CREDITS

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2452,6 +2452,10 @@ S: 482 Shadowgraph Dr.
	S: San Jose, CA 95110		S: San Jose, CA 95110
	S: USA		S: USA

			N: Michal Marek
			E: michal.lkml@markovi.net
			D: Kbuild Maintainer 2009-2017

	N: Martin Mares		N: Martin Mares
	E: mj@ucw.cz		E: mj@ucw.cz
	W: http://www.ucw.cz/~mj/		W: http://www.ucw.cz/~mj/

Documentation/devicetree/bindings/input/goodix,gt7375p.yaml

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,10 @@ description:

	properties:		properties:
	compatible:		compatible:
	items:		oneOf:
			- const: goodix,gt7375p
			- items:
			- const: goodix,gt7986u
	- const: goodix,gt7375p		- const: goodix,gt7375p

	reg:		reg:

Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ title: Audio codec controlled by ChromeOS EC

	maintainers:		maintainers:
	- Cheng-Yi Chiang <cychiang@chromium.org>		- Cheng-Yi Chiang <cychiang@chromium.org>
	- Tzung-Bi Shih <tzungbi@google.com>		- Tzung-Bi Shih <tzungbi@kernel.org>

	description: \|		description: \|
	Google's ChromeOS EC codec is a digital mic codec provided by the		Google's ChromeOS EC codec is a digital mic codec provided by the

Documentation/devicetree/bindings/sound/realtek,rt1015p.yaml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
	title: Realtek rt1015p codec devicetree bindings		title: Realtek rt1015p codec devicetree bindings

	maintainers:		maintainers:
	- Tzung-Bi Shih <tzungbi@google.com>		- Tzung-Bi Shih <tzungbi@kernel.org>

	description: \|		description: \|
	Rt1015p is a rt1015 variant which does not support I2C and		Rt1015p is a rt1015 variant which does not support I2C and