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

Commit dfbc1534 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

Merge branch 'debugfs_automount' of... 

Merge branch 'debugfs_automount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into trace/ftrace/tracefs

Pull in Al Viro's changes to debugfs that implement the new primitive:
debugfs_create_automount(), that creates a directory in debugfs that will
safely mount another file system automatically when debugfs is mounted.

This will let tracefs automount itself on top of debugfs/tracing directory.
parents 7eeafbca 163f9eb9

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ Greg Kroah-Hartman <gregkh@suse.de> 
Greg Kroah-Hartman <greg@kroah.com>

Henk Vergonet <Henk.Vergonet@gmail.com>

Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>

Herbert Xu <herbert@gondor.apana.org.au>

Jacob Shin <Jacob.Shin@amd.com>

James Bottomley <jejb@mulgrave.(none)>

Documentation/ABI/testing/sysfs-class-mei

+15 −0
Original line number Diff line number Diff line
@@ -14,3 +14,18 @@ Description: 
		The /sys/class/mei/meiN directory is created for

		each probed mei device



What:		/sys/class/mei/meiN/fw_status

Date:		Nov 2014

KernelVersion:	3.19

Contact:	Tomas Winkler <tomas.winkler@intel.com>

Description:	Display fw status registers content



		The ME FW writes its status information into fw status

		registers for BIOS and OS to monitor fw health.



		The register contains running state, power management

		state, error codes, and others. The way the registers

		are decoded depends on PCH or SoC generation.

		Also number of registers varies between 1 and 6

		depending on generation.

Documentation/devicetree/bindings/input/gpio-keys.txt

+7 −3
Original line number Diff line number Diff line
@@ -10,12 +10,13 @@ Optional properties: 
Each button (key) is represented as a sub-node of "gpio-keys":

Subnode properties:



	- gpios: OF device-tree gpio specification.

	- interrupts: the interrupt line for that input.

	- label: Descriptive name of the key.

	- linux,code: Keycode to emit.



Required mutual exclusive subnode-properties:

	- gpios: OF device-tree gpio specification.

	- interrupts: the interrupt line for that input

Note that either "interrupts" or "gpios" properties can be omitted, but not

both at the same time. Specifying both properties is allowed.



Optional subnode-properties:

	- linux,input-type: Specify event type this button/key generates.
@@ -23,6 +24,9 @@ Optional subnode-properties: 
	- debounce-interval: Debouncing interval time in milliseconds.

	  If not specified defaults to 5.

	- gpio-key,wakeup: Boolean, button can wake-up the system.

	- linux,can-disable: Boolean, indicates that button is connected

	  to dedicated (not shared) interrupt which can be disabled to

	  suppress events from the button.



Example nodes:

Documentation/devicetree/bindings/input/stmpe-keypad.txt

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ Optional properties: 
 - debounce-interval        : Debouncing interval time in milliseconds

 - st,scan-count            : Scanning cycles elapsed before key data is updated

 - st,no-autorepeat         : If specified device will not autorepeat

 - keypad,num-rows          : See ./matrix-keymap.txt

 - keypad,num-columns       : See ./matrix-keymap.txt



Example:

Documentation/networking/ip-sysctl.txt

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ fwmark_reflect - BOOLEAN 
route/max_size - INTEGER

	Maximum number of routes allowed in the kernel.  Increase

	this when using large numbers of interfaces and/or routes.

	From linux kernel 3.6 onwards, this is deprecated for ipv4

	as route cache is no longer used.



neigh/default/gc_thresh1 - INTEGER

	Minimum number of entries to keep.  Garbage collector will not