Commit b3cc7428 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.15/amd_sfh' into for-linus 

From: Mario Limonciello <mario.limonciello@amd.com>

Some platforms include a human presence detection (HPD) sensor. When
enabled and a user is detected a wake event will be emitted from the
sensor fusion hub that software can react to.

Example use cases are "wake from suspend on approach" or to "lock
when leaving".

This is currently enabled by default on supported systems, but users
can't control it. This essentially means that wake on approach is
enabled which is a really surprising behavior to users that don't
expect it.

Instead of defaulting to enabled add a sysfs knob that users can
use to enable the feature if desirable and set it to disabled by
default.
parents db52926f 01601fdd

.mailmap

+9 −1
Original line number Diff line number Diff line
@@ -142,13 +142,17 @@ Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com> 
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>

Brendan Higgins <brendan.higgins@linux.dev> <brendanhiggins@google.com>

Brian Avery <b.avery@hp.com>

Brian Cain <bcain@kernel.org> <brian.cain@oss.qualcomm.com>

Brian Cain <bcain@kernel.org> <bcain@quicinc.com>

Brian King <brking@us.ibm.com>

Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>

Bryan Tan <bryan-bt.tan@broadcom.com> <bryantan@vmware.com>

Cai Huoqing <cai.huoqing@linux.dev> <caihuoqing@baidu.com>

Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>

Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>

Carlos Bilbao <carlos.bilbao.osdev@gmail.com> <carlos.bilbao@amd.com>

Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao@amd.com>

Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao.osdev@gmail.com>

Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu>

Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>

Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>

Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
@@ -165,6 +169,7 @@ Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com> 
Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>

Christian Marangi <ansuelsmth@gmail.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christopher Obbard <christopher.obbard@linaro.org> <chris.obbard@collabora.com>

Christoph Hellwig <hch@lst.de>

Chuck Lever <chuck.lever@oracle.com> <cel@kernel.org>

Chuck Lever <chuck.lever@oracle.com> <cel@netapp.com>
@@ -261,6 +266,7 @@ Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com> 
Guru Das Srinagesh <quic_gurus@quicinc.com> <gurus@codeaurora.org>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <padovan@profusion.mobi>

Hamza Mahfooz <hamzamahfooz@linux.microsoft.com> <hamza.mahfooz@amd.com>

Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>

Hans Verkuil <hverkuil@xs4all.nl> <hansverk@cisco.com>

Hans Verkuil <hverkuil@xs4all.nl> <hverkuil-cisco@xs4all.nl>
@@ -415,6 +421,7 @@ Liam Mark <quic_lmark@quicinc.com> <lmark@codeaurora.org> 
Linas Vepstas <linas@austin.ibm.com>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

Linus Lüssing <linus.luessing@c0d3.blue> <ll@simonwunderlich.de>

<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>

Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>

Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
@@ -760,6 +767,7 @@ Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de> 
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>

Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>

Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>

Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>

Yusuke Goda <goda.yusuke@renesas.com>

Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>

Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

CREDITS

+3 −5
Original line number Diff line number Diff line
@@ -2515,11 +2515,9 @@ D: SLS distribution 
D: Initial implementation of VC's, pty's and select()



N: Pavel Machek

E: pavel@ucw.cz

E: pavel@kernel.org

P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585  B8C7 C060 2241 92DF CE96

D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,

D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,

D: work on suspend-to-ram/disk, killing duplicates from ioctl32,

D: NBD, Sun4/330 port, USB, work on suspend-to-ram/disk,

D: Altera SoCFPGA and Nokia N900 support.

S: Czech Republic
@@ -4339,7 +4337,7 @@ D: Freescale Highspeed USB device driver 
D: Freescale QE SoC support and Ethernet driver

S: B-1206 Jingmao Guojigongyu

S: 16 Baliqiao Nanjie, Beijing 101100

S: People's Repulic of China

S: People's Republic of China



N: Vlad Yasevich

E: vyasevich@gmail.com

Documentation/ABI/stable/sysfs-class-bluetooth

0 → 100644
+9 −0
Original line number Diff line number Diff line 
What: 		/sys/class/bluetooth/hci<index>/reset

Date:		14-Jan-2025

KernelVersion:	6.13

Contact:	linux-bluetooth@vger.kernel.org

Description: 	This write-only attribute allows users to trigger the vendor reset

		method on the Bluetooth device when arbitrary data is written.

		The reset may or may not be done through the device transport

		(e.g., UART/USB), and can also be done through an out-of-band

		approach such as GPIO.

Documentation/ABI/testing/sysfs-bus-coresight-devices-dummy-source

0 → 100644
+15 −0
Original line number Diff line number Diff line 
What:		/sys/bus/coresight/devices/dummy_source<N>/enable_source

Date:		Dec 2024

KernelVersion:	6.14

Contact:	Mao Jinlong <quic_jinlmao@quicinc.com>

Description:	(RW) Enable/disable tracing of dummy source. A sink should be activated

		before enabling the source. The path of coresight components linking

		the source to the sink is configured and managed automatically by the

		coresight framework.



What:		/sys/bus/coresight/devices/dummy_source<N>/traceid

Date:		Dec 2024

KernelVersion:	6.14

Contact:	Mao Jinlong <quic_jinlmao@quicinc.com>

Description:	(R) Show the trace ID that will appear in the trace stream

		coming from this trace entity.

Documentation/ABI/testing/sysfs-bus-event_source-devices

0 → 100644
+24 −0
Original line number Diff line number Diff line 
What: /sys/bus/event_source/devices/<pmu>

Date: 2014/02/24

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

Description:	Performance Monitoring Unit (<pmu>)



		Each <pmu> directory, for a PMU device, is a name

		optionally followed by an underscore and then either a

		decimal or hexadecimal number. For example, cpu is a

		PMU name without a suffix as is intel_bts,

		uncore_imc_0 is a PMU name with a 0 numeric suffix,

		ddr_pmu_87e1b0000000 is a PMU name with a hex

		suffix. The hex suffix must be more than two

		characters long to avoid ambiguity with PMUs like the

		S390 cpum_cf.



		Tools can treat PMUs with the same name that differ by

		suffix as instances of the same PMU for the sake of,

		for example, opening an event. For example, the PMUs

		uncore_imc_free_running_0 and

		uncore_imc_free_running_1 have an event data_read;

		opening the data_read event on a PMU specified as

		uncore_imc_free_running should be treated as opening

		the data_read event on PMU uncore_imc_free_running_0

		and PMU uncore_imc_free_running_1.