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

Commit 8dd9117c authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 



Pulled mainline in order to get the UAPI infrastructure already
merged before I pull in David Howells's UAPI trees for networking.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 16e310ae 547b1e81

Documentation/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -270,8 +270,6 @@ preempt-locking.txt 
	- info on locking under a preemptive kernel.

printk-formats.txt

	- how to get printk format specifiers right

prio_tree.txt

	- info on radix-priority-search-tree use for indexing vmas.

ramoops.txt

	- documentation of the ramoops oops/panic logging module.

rbtree.txt

Documentation/ABI/obsolete/proc-pid-oom_adj

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
What:	/proc/<pid>/oom_adj

When:	August 2012

Why:	/proc/<pid>/oom_adj allows userspace to influence the oom killer's

	badness heuristic used to determine which task to kill when the kernel

	is out of memory.



	The badness heuristic has since been rewritten since the introduction of

	this tunable such that its meaning is deprecated.  The value was

	implemented as a bitshift on a score generated by the badness()

	function that did not have any precise units of measure.  With the

	rewrite, the score is given as a proportion of available memory to the

	task allocating pages, so using a bitshift which grows the score

	exponentially is, thus, impossible to tune with fine granularity.



	A much more powerful interface, /proc/<pid>/oom_score_adj, was

	introduced with the oom killer rewrite that allows users to increase or

	decrease the badness score linearly.  This interface will replace

	/proc/<pid>/oom_adj.



	A warning will be emitted to the kernel log if an application uses this

	deprecated interface.  After it is printed once, future warnings will be

	suppressed until the kernel is rebooted.

Documentation/ABI/testing/sysfs-bus-rbd

+12 −6
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ client_id 


	The ceph unique client id that was assigned for this specific session.



features



	A hexadecimal encoding of the feature bits for this image.



major



	The block device major number.
@@ -33,6 +37,11 @@ name 


	The name of the rbd image.



image_id



	The unique id for the rbd image.  (For rbd image format 1

	this is empty.)



pool



	The name of the storage pool where this rbd image resides.
@@ -57,12 +66,6 @@ current_snap 


	The current snapshot for which the device is mapped.



create_snap



	Create a snapshot:



	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create



snap_*



	A directory per each snapshot
@@ -79,4 +82,7 @@ snap_size 


	The size of the image when this snapshot was taken.



snap_features



	A hexadecimal encoding of the feature bits for this snapshot.

Documentation/ABI/testing/sysfs-devices-firmware_node

0 → 100644
+17 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../firmware_node/

Date:		September 2012

Contact:	<>

Description:

		The /sys/devices/.../firmware_node directory contains attributes

		allowing the user space to check and modify some firmware

		related properties of given device.



What:		/sys/devices/.../firmware_node/description

Date:		September 2012

Contact:	Lance Ortiz <lance.ortiz@hp.com>

Description:

		The /sys/devices/.../firmware/description attribute contains a string

		that describes the device as provided by the _STR method in the ACPI

		namespace.  This attribute is read-only.  If the device does not have

		an _STR method associated with it in the ACPI namespace, this

		attribute is not present.

Documentation/ABI/testing/sysfs-fs-ext4

+13 −0
Original line number Diff line number Diff line
@@ -96,3 +96,16 @@ Contact: "Theodore Ts'o" <tytso@mit.edu> 
Description:

		The maximum number of megabytes the writeback code will

		try to write out before move on to another inode.



What:		/sys/fs/ext4/<disk>/extent_max_zeroout_kb

Date:		August 2012

Contact:	"Theodore Ts'o" <tytso@mit.edu>

Description:

		The maximum number of kilobytes which will be zeroed

		out in preference to creating a new uninitialized

		extent when manipulating an inode's extent tree.  Note

		that using a larger value will increase the

		variability of time necessary to complete a random

		write operation (since a 4k random write might turn

		into a much larger write due to the zeroout

		operation).