Commit fc4378b2 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

Merge tag 'spi-mem-dtr-2' into nand/next 

spi: Support DTR in spi-mem

Changes to support DTR with spi-mem.
parents d0b806fc e896c048

.mailmap

+2 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com> 
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>

Mathieu Othacehe <m.othacehe@gmail.com> <othacehe@gnu.org>

Mathieu Othacehe <othacehe@gnu.org> <m.othacehe@gmail.com>

Mat Martineau <martineau@kernel.org> <mathew.j.martineau@linux.intel.com>

Mat Martineau <martineau@kernel.org> <mathewm@codeaurora.org>

Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
@@ -735,6 +735,7 @@ Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de> 
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>

Yusuke Goda <goda.yusuke@renesas.com>

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

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

Documentation/ABI/testing/sysfs-class-watchdog

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ Description: 
		timeout when the pretimeout interrupt is delivered.  Pretimeout

		is an optional feature.



What:		/sys/class/watchdog/watchdogn/pretimeout_avaialable_governors

What:		/sys/class/watchdog/watchdogn/pretimeout_available_governors

Date:		February 2017

Contact:	Wim Van Sebroeck <wim@iguana.be>

Description:

Documentation/admin-guide/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -4822,6 +4822,11 @@ 
			       can be preempted anytime.  Tasks will also yield

			       contended spinlocks (if the critical section isn't

			       explicitly preempt disabled beyond the lock itself).

			lazy - Scheduler controlled. Similar to full but instead

			       of preempting the task immediately, the task gets

			       one HZ tick time to yield itself before the

			       preemption will be forced. One preemption is when the

			       task returns to user space.



	print-fatal-signals=

			[KNL] debug: print fatal signals

Documentation/admin-guide/laptops/thinkpad-acpi.rst

+7 −3
Original line number Diff line number Diff line
@@ -445,8 +445,10 @@ event code Key Notes 
0x1008	0x07	FN+F8		IBM: toggle screen expand

				Lenovo: configure UltraNav,

				or toggle screen expand.

				On newer platforms (2024+)

				replaced by 0x131f (see below)

				On 2024 platforms replaced by

				0x131f (see below) and on newer

				platforms (2025 +) keycode is

				replaced by 0x1401 (see below).



0x1009	0x08	FN+F9		-
@@ -506,9 +508,11 @@ event code Key Notes 


0x1019	0x18	unknown



0x131f	...	FN+F8	        Platform Mode change.

0x131f	...	FN+F8		Platform Mode change (2024 systems).

				Implemented in driver.



0x1401	...	FN+F8		Platform Mode change (2025 + systems).

				Implemented in driver.

...	...	...



0x1020	0x1F	unknown

Documentation/admin-guide/mm/transhuge.rst

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ AnonHugePmdMapped). 
The number of file transparent huge pages mapped to userspace is available

by reading ShmemPmdMapped and ShmemHugePages fields in ``/proc/meminfo``.

To identify what applications are mapping file transparent huge pages, it

is necessary to read ``/proc/PID/smaps`` and count the FileHugeMapped fields

is necessary to read ``/proc/PID/smaps`` and count the FilePmdMapped fields

for each mapping.



Note that reading the smaps file is expensive and reading it