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

Commit bf550fc9 authored by Alexander Graf's avatar Alexander Graf
Browse files

Merge remote-tracking branch 'origin/next' into kvm-ppc-next 

Conflicts:
	mm/Kconfig

CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
parents 7e48c101 cc2df20c

Documentation/ABI/stable/sysfs-driver-ib_srp

+7 −0
Original line number Diff line number Diff line
@@ -54,6 +54,13 @@ Description: Interface for making ib_srp connect to a new target. 
		  ib_srp. Specifying a value that exceeds cmd_sg_entries is

		  only safe with partial memory descriptor list support enabled

		  (allow_ext_sg=1).

		* comp_vector, a number in the range 0..n-1 specifying the

		  MSI-X completion vector. Some HCA's allocate multiple (n)

		  MSI-X vectors per HCA port. If the IRQ affinity masks of

		  these interrupts have been configured such that each MSI-X

		  interrupt is handled by a different CPU then the comp_vector

		  parameter can be used to spread the SRP completion workload

		  over multiple CPU's.



What:		/sys/class/infiniband_srp/srp-<hca>-<port_number>/ibdev

Date:		January 2, 2006

Documentation/ABI/stable/sysfs-module

+7 −3
Original line number Diff line number Diff line
@@ -4,9 +4,13 @@ Description: 


	/sys/module/MODULENAME

		The name of the module that is in the kernel.  This

		module name will show up either if the module is built

		directly into the kernel, or if it is loaded as a

		dynamic module.

		module name will always show up if the module is loaded as a

		dynamic module.  If it is built directly into the kernel, it

		will only show up if it has a version or at least one

		parameter.



		Note: The conditions of creation in the built-in case are not

		by design and may be removed in the future.



	/sys/module/MODULENAME/parameters

		This directory contains individual files that are each

Documentation/ABI/testing/sysfs-bus-acpi

0 → 100644
+58 −0
Original line number Diff line number Diff line 
What:		/sys/bus/acpi/devices/.../path

Date:		December 2006

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		This attribute indicates the full path of ACPI namespace

		object associated with the device object.  For example,

		\_SB_.PCI0.

		This file is not present for device objects representing

		fixed ACPI hardware features (like power and sleep

		buttons).



What:		/sys/bus/acpi/devices/.../modalias

Date:		July 2007

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		This attribute indicates the PNP IDs of the device object.

		That is acpi:HHHHHHHH:[CCCCCCC:].  Where each HHHHHHHH or

		CCCCCCCC contains device object's PNPID (_HID or _CID).



What:		/sys/bus/acpi/devices/.../hid

Date:		April 2005

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		This attribute indicates the hardware ID (_HID) of the

		device object.  For example, PNP0103.

		This file is present for device objects having the _HID

		control method.



What:		/sys/bus/acpi/devices/.../description

Date:		October 2012

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		This attribute contains the output of the device object's

		_STR control method, if present.



What:		/sys/bus/acpi/devices/.../adr

Date:		October 2012

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		This attribute contains the output of the device object's

		_ADR control method, which is present for ACPI device

		objects representing devices having standard enumeration

		algorithms, such as PCI.



What:		/sys/bus/acpi/devices/.../uid

Date:		October 2012

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		This attribute contains the output of the device object's

		_UID control method, if present.



What:		/sys/bus/acpi/devices/.../eject

Date:		December 2006

Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		Writing 1 to this attribute will trigger hot removal of

		this device object.  This file exists for every device

		object that has _EJ0 method.

Documentation/ABI/testing/sysfs-bus-event_source-devices-events

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ Description: Generic performance monitoring events 


What: 		/sys/devices/cpu/events/PM_1PLUS_PPC_CMPL

		/sys/devices/cpu/events/PM_BRU_FIN

		/sys/devices/cpu/events/PM_BRU_MPRED

		/sys/devices/cpu/events/PM_BR_MPRED

		/sys/devices/cpu/events/PM_CMPLU_STALL

		/sys/devices/cpu/events/PM_CMPLU_STALL_BRU

		/sys/devices/cpu/events/PM_CMPLU_STALL_DCACHE_MISS

Documentation/ABI/testing/sysfs-class-devfreq

+20 −0
Original line number Diff line number Diff line
@@ -78,3 +78,23 @@ Contact: Nishanth Menon <nm@ti.com> 
Description:

		The /sys/class/devfreq/.../available_governors shows

		currently available governors in the system.



What:		/sys/class/devfreq/.../min_freq

Date:		January 2013

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		The /sys/class/devfreq/.../min_freq shows and stores

		the minimum frequency requested by users. It is 0 if

		the user does not care. min_freq overrides the

		frequency requested by governors.



What:		/sys/class/devfreq/.../max_freq

Date:		January 2013

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		The /sys/class/devfreq/.../max_freq shows and stores

		the maximum frequency requested by users. It is 0 if

		the user does not care. max_freq overrides the

		frequency requested by governors and min_freq.

		The max_freq overrides min_freq because max_freq may be

		used to throttle devices to avoid overheating.