Commit a46fe1fe authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge branch 'i2c/i2c-host' of... 

Merge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-mergewindow

Andi is unavailable for some time. So, I take over his work for this
mergewindow.
parents 735668f8 fd4e9308

.mailmap

+1 −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>

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

Documentation/devicetree/bindings/display/bridge/adi,adv7533.yaml

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ properties: 
  adi,dsi-lanes:

    description: Number of DSI data lanes connected to the DSI host.

    $ref: /schemas/types.yaml#/definitions/uint32

    enum: [ 1, 2, 3, 4 ]

    enum: [ 2, 3, 4 ]



  "#sound-dai-cells":

    const: 0

Documentation/devicetree/bindings/i2c/i2c-exynos5.yaml

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ properties: 
          - samsung,exynos5250-hsi2c    # Exynos5250 and Exynos5420

          - samsung,exynos5260-hsi2c    # Exynos5260

          - samsung,exynos7-hsi2c       # Exynos7

          - samsung,exynos8895-hsi2c

          - samsung,exynosautov9-hsi2c

      - items:

          - enum: