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

Commit 9a5d9315 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-resources', 'acpi-battery', 'acpi-doc' and 'acpi-pnp' 

* acpi-resources:
  x86/PCI/ACPI: Make all resources except [io 0xcf8-0xcff] available on PCI bus

* acpi-battery:
  ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook

* acpi-doc:
  ACPI / documentation: Fix ambiguity in the GPIO properties document
  ACPI / documentation: fix a sentence about GPIO resources

* acpi-pnp:
  ACPI / PNP: add two IDs to list for PNPACPI device enumeration
parents 2c62e849 3349fb64 a00212e2 622532bb

Documentation/acpi/enumeration.txt

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ input driver: 
GPIO support

~~~~~~~~~~~~

ACPI 5 introduced two new resources to describe GPIO connections: GpioIo

and GpioInt. These resources are used be used to pass GPIO numbers used by

and GpioInt. These resources can be used to pass GPIO numbers used by

the device to the driver. ACPI 5.1 extended this with _DSD (Device

Specific Data) which made it possible to name the GPIOs among other things.

Documentation/acpi/gpio-properties.txt

+3 −3
Original line number Diff line number Diff line 
_DSD Device Properties Related to GPIO

--------------------------------------



With the release of ACPI 5.1 and the _DSD configuration objecte names

can finally be given to GPIOs (and other things as well) returned by

_CRS.  Previously, we were only able to use an integer index to find

With the release of ACPI 5.1, the _DSD configuration object finally

allows names to be given to GPIOs (and other things as well) returned

by _CRS.  Previously, we were only able to use an integer index to find

the corresponding GPIO, which is pretty error prone (it depends on

the _CRS output ordering, for example).

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -3787,6 +3787,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					READ_CAPACITY_16 command);

				f = NO_REPORT_OPCODES (don't use report opcodes

					command, uas only);

				g = MAX_SECTORS_240 (don't transfer more than

					240 sectors at a time, uas only);

				h = CAPACITY_HEURISTICS (decrease the

					reported device capacity by one

					sector if the number is odd);

Documentation/module-signing.txt

+3 −3
Original line number Diff line number Diff line
@@ -119,9 +119,9 @@ Most notably, in the x509.genkey file, the req_distinguished_name section 
should be altered from the default:



	[ req_distinguished_name ]

	O = Magrathea

	CN = Glacier signing key

	emailAddress = slartibartfast@magrathea.h2g2

	#O = Unspecified company

	CN = Build time autogenerated kernel key

	#emailAddress = unspecified.user@unspecified.company



The generated RSA key size can also be set with:

Documentation/networking/mpls-sysctl.txt

+9 −0
Original line number Diff line number Diff line
@@ -18,3 +18,12 @@ platform_labels - INTEGER 


	Possible values: 0 - 1048575

	Default: 0



conf/<interface>/input - BOOL

	Control whether packets can be input on this interface.



	If disabled, packets will be discarded without further

	processing.



	0 - disabled (default)

	not 0 - enabled