Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60c07f80 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpica-fixes', 'acpi-video' and 'acpi-processor' 

* acpica-fixes:
  ACPICA / Hardware: Fix old register check in acpi_hw_get_access_bit_width()

* acpi-video:
  ACPI / Thermal / video: fix max_level incorrect value

* acpi-processor:
  ACPI / processor: Avoid reserving IO regions too early
parents 7f9bef9d 9f9cd7ee 86314751

.gitignore

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ Module.symvers 
/tar-install/

/tar-install/





#

#

# git files that we don't want to ignore even it they are dot-files

# git files that we don't want to ignore even if they are dot-files

#

#

!.gitignore

!.gitignore

!.mailmap

!.mailmap

.mailmap

+1 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,7 @@ Jean Tourrilhes <jt@hpl.hp.com> 
Jeff Garzik <jgarzik@pretzel.yyz.us>

Jeff Garzik <jgarzik@pretzel.yyz.us>

Jens Axboe <axboe@suse.de>

Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

John Stultz <johnstul@us.ibm.com>

<josh@joshtriplett.org> <josh@freedesktop.org>

<josh@joshtriplett.org> <josh@freedesktop.org>

<josh@joshtriplett.org> <josh@kernel.org>

<josh@joshtriplett.org> <josh@kernel.org>

CREDITS

+1 −0
Original line number Original line Diff line number Diff line
@@ -768,6 +768,7 @@ D: Z85230 driver 
D: Former security contact point (please use vendor-sec@lst.de)

D: Former security contact point (please use vendor-sec@lst.de)

D: ex 2.2 maintainer

D: ex 2.2 maintainer

D: 2.1.x modular sound

D: 2.1.x modular sound

D: Assigned major/minor numbers maintainer at lanana.org

S: c/o Red Hat UK Ltd

S: c/o Red Hat UK Ltd

S: Alexandra House

S: Alexandra House

S: Alexandra Terrace

S: Alexandra Terrace

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-savu

+6 −5
Original line number Original line Diff line number Diff line
@@ -3,9 +3,10 @@ Date: Mai 2012 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split into general settings and

		press of a button. A profile is split into general settings and

		button settings. buttons holds informations about button layout.

		button settings. The buttons variable holds information about

		When written, this file lets one write the respective profile

		button layout. When written, this file lets one write the

		buttons to the mouse. The data has to be 47 bytes long.

		respective profile buttons to the mouse. The data has to be

		47 bytes long.

		The mouse will reject invalid data.

		The mouse will reject invalid data.

		Which profile to write is determined by the profile number

		Which profile to write is determined by the profile number

		contained in the data.

		contained in the data.
@@ -26,8 +27,8 @@ Date: Mai 2012 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split into general settings and

		press of a button. A profile is split into general settings and

		button settings. profile holds informations like resolution, sensitivity

		button settings. A profile holds information like resolution,

		and light effects.

		sensitivity and light effects.

		When written, this file lets one write the respective profile

		When written, this file lets one write the respective profile

		settings back to the mouse. The data has to be 43 bytes long.

		settings back to the mouse. The data has to be 43 bytes long.

		The mouse will reject invalid data.

		The mouse will reject invalid data.

Documentation/ABI/stable/sysfs-class-ubi

+9 −0
Original line number Original line Diff line number Diff line
@@ -107,6 +107,15 @@ Contact: Artem Bityutskiy <dedekind@infradead.org> 
Description:

Description:

		Number of physical eraseblocks reserved for bad block handling.

		Number of physical eraseblocks reserved for bad block handling.





What:		/sys/class/ubi/ubiX/ro_mode

Date:		April 2016

KernelVersion:	4.7

Contact:	linux-mtd@lists.infradead.org

Description:

		Contains ASCII "1\n" if the read-only flag is set on this

		device, and "0\n" if it is cleared. UBI devices mark themselves

		as read-only when they detect an unrecoverable error.



What:		/sys/class/ubi/ubiX/total_eraseblocks

What:		/sys/class/ubi/ubiX/total_eraseblocks

Date:		July 2006

Date:		July 2006

KernelVersion:	2.6.22

KernelVersion:	2.6.22