Commit 44f10dbe authored by Andrew Morton's avatar Andrew Morton
Browse files

Merge branch 'master' into mm-hotfixes-stable

parents 0a30901b e55e5df1
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -254,6 +254,7 @@ ForEachMacros:
  - 'for_each_free_mem_range'
  - 'for_each_free_mem_range'
  - 'for_each_free_mem_range_reverse'
  - 'for_each_free_mem_range_reverse'
  - 'for_each_func_rsrc'
  - 'for_each_func_rsrc'
  - 'for_each_group_device'
  - 'for_each_group_evsel'
  - 'for_each_group_evsel'
  - 'for_each_group_member'
  - 'for_each_group_member'
  - 'for_each_hstate'
  - 'for_each_hstate'
+1 −0
Original line number Original line Diff line number Diff line
@@ -2,3 +2,4 @@
*.[ch] diff=cpp
*.[ch] diff=cpp
*.dts diff=dts
*.dts diff=dts
*.dts[io] diff=dts
*.dts[io] diff=dts
*.rs diff=rust
+3 −0
Original line number Original line Diff line number Diff line
@@ -183,6 +183,8 @@ Henrik Rydberg <rydberg@bitmath.org>
Herbert Xu <herbert@gondor.apana.org.au>
Herbert Xu <herbert@gondor.apana.org.au>
Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
J. Bruce Fields <bfields@fieldses.org> <bfields@redhat.com>
J. Bruce Fields <bfields@fieldses.org> <bfields@citi.umich.edu>
Jacob Shin <Jacob.Shin@amd.com>
Jacob Shin <Jacob.Shin@amd.com>
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>
Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>
@@ -330,6 +332,7 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@mellanox.com>
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>
Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>
Maxime Ripard <mripard@kernel.org> <maxime@cerno.tech>
Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
Mayuresh Janorkar <mayur@ti.com>
Mayuresh Janorkar <mayur@ti.com>
+6 −0
Original line number Original line Diff line number Diff line
@@ -383,6 +383,12 @@ E: tomas@nocrew.org
W: http://tomas.nocrew.org/
W: http://tomas.nocrew.org/
D: dsp56k device driver
D: dsp56k device driver


N: Srivatsa S. Bhat
E: srivatsa@csail.mit.edu
D: Maintainer of Generic Paravirt-Ops subsystem
D: Maintainer of VMware hypervisor interface
D: Maintainer of VMware virtual PTP clock driver (ptp_vmw)

N: Ross Biro
N: Ross Biro
E: ross.biro@gmail.com
E: ross.biro@gmail.com
D: Original author of the Linux networking code
D: Original author of the Linux networking code
+89 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,11 @@ Description:
		Specifies the duration of the LED blink in milliseconds.
		Specifies the duration of the LED blink in milliseconds.
		Defaults to 50 ms.
		Defaults to 50 ms.


		With hw_control ON, the interval value MUST be set to the
		default value and cannot be changed.
		Trying to set any value in this specific mode will return
		an EINVAL error.

What:		/sys/class/leds/<led>/link
What:		/sys/class/leds/<led>/link
Date:		Dec 2017
Date:		Dec 2017
KernelVersion:	4.16
KernelVersion:	4.16
@@ -39,6 +44,9 @@ Description:
		If set to 1, the LED will blink for the milliseconds specified
		If set to 1, the LED will blink for the milliseconds specified
		in interval to signal transmission.
		in interval to signal transmission.


		With hw_control ON, the blink interval is controlled by hardware
		and won't reflect the value set in interval.

What:		/sys/class/leds/<led>/rx
What:		/sys/class/leds/<led>/rx
Date:		Dec 2017
Date:		Dec 2017
KernelVersion:	4.16
KernelVersion:	4.16
@@ -50,3 +58,84 @@ Description:


		If set to 1, the LED will blink for the milliseconds specified
		If set to 1, the LED will blink for the milliseconds specified
		in interval to signal reception.
		in interval to signal reception.

		With hw_control ON, the blink interval is controlled by hardware
		and won't reflect the value set in interval.

What:		/sys/class/leds/<led>/hw_control
Date:		Jun 2023
KernelVersion:	6.5
Contact:	linux-leds@vger.kernel.org
Description:
		Communicate whether the LED trigger modes are driven by hardware
		or software fallback is used.

		If 0, the LED is using software fallback to blink.

		If 1, the LED is using hardware control to blink and signal the
		requested modes.

What:		/sys/class/leds/<led>/link_10
Date:		Jun 2023
KernelVersion:	6.5
Contact:	linux-leds@vger.kernel.org
Description:
		Signal the link speed state of 10Mbps of the named network device.

		If set to 0 (default), the LED's normal state is off.

		If set to 1, the LED's normal state reflects the link state
		speed of 10MBps of the named network device.
		Setting this value also immediately changes the LED state.

What:		/sys/class/leds/<led>/link_100
Date:		Jun 2023
KernelVersion:	6.5
Contact:	linux-leds@vger.kernel.org
Description:
		Signal the link speed state of 100Mbps of the named network device.

		If set to 0 (default), the LED's normal state is off.

		If set to 1, the LED's normal state reflects the link state
		speed of 100Mbps of the named network device.
		Setting this value also immediately changes the LED state.

What:		/sys/class/leds/<led>/link_1000
Date:		Jun 2023
KernelVersion:	6.5
Contact:	linux-leds@vger.kernel.org
Description:
		Signal the link speed state of 1000Mbps of the named network device.

		If set to 0 (default), the LED's normal state is off.

		If set to 1, the LED's normal state reflects the link state
		speed of 1000Mbps of the named network device.
		Setting this value also immediately changes the LED state.

What:		/sys/class/leds/<led>/half_duplex
Date:		Jun 2023
KernelVersion:	6.5
Contact:	linux-leds@vger.kernel.org
Description:
		Signal the link half duplex state of the named network device.

		If set to 0 (default), the LED's normal state is off.

		If set to 1, the LED's normal state reflects the link half
		duplex state of the named network device.
		Setting this value also immediately changes the LED state.

What:		/sys/class/leds/<led>/full_duplex
Date:		Jun 2023
KernelVersion:	6.5
Contact:	linux-leds@vger.kernel.org
Description:
		Signal the link full duplex state of the named network device.

		If set to 0 (default), the LED's normal state is off.

		If set to 1, the LED's normal state reflects the link full
		duplex state of the named network device.
		Setting this value also immediately changes the LED state.
Loading