Commit 0588000e authored by Alexander Graf's avatar Alexander Graf
Browse files

Merge commit 'origin/queue' into for-queue 

Conflicts:
	arch/powerpc/include/asm/Kbuild
	arch/powerpc/include/uapi/asm/Kbuild
parents 8b5869ad 81c52c56

.gitignore

+8 −0
Original line number Diff line number Diff line
@@ -84,3 +84,11 @@ GTAGS 
*.orig

*~

\#*#



#

# Leavings from module signing

#

extra_certificates

signing_key.priv

signing_key.x509

x509.genkey

Documentation/00-INDEX

+2 −4
Original line number Diff line number Diff line
@@ -210,6 +210,8 @@ local_ops.txt 
	- semantics and behavior of local atomic operations.

lockdep-design.txt

	- documentation on the runtime locking correctness validator.

lockup-watchdogs.txt

	- info on soft and hard lockup detectors (aka nmi_watchdog).

logo.gif

	- full colour GIF image of Linux logo (penguin - Tux).

logo.txt
@@ -240,8 +242,6 @@ netlabel/ 
	- directory with information on the NetLabel subsystem.

networking/

	- directory with info on various aspects of networking with Linux.

nmi_watchdog.txt

	- info on NMI watchdog for SMP systems.

nommu-mmap.txt

	- documentation about no-mmu memory mapping support.

numastat.txt
@@ -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-block

+14 −0
Original line number Diff line number Diff line
@@ -206,3 +206,17 @@ Description: 
		when a discarded area is read the discard_zeroes_data

		parameter will be set to one. Otherwise it will be 0 and

		the result of reading a discarded area is undefined.



What:		/sys/block/<disk>/queue/write_same_max_bytes

Date:		January 2012

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Some devices support a write same operation in which a

		single data block can be written to a range of several

		contiguous blocks on storage. This can be used to wipe

		areas on disk or to initialize drives in a RAID

		configuration. write_same_max_bytes indicates how many

		bytes can be written in a single write same command. If

		write_same_max_bytes is 0, write same is not supported

		by the device.

Documentation/ABI/testing/sysfs-bus-fcoe

+6 −6
Original line number Diff line number Diff line
@@ -9,19 +9,19 @@ Attributes: 
			  this value will change the dev_loss_tmo for all

			  FCFs discovered by this controller.



	lesb_link_fail:   Link Error Status Block (LESB) link failure count.

	lesb/link_fail:   Link Error Status Block (LESB) link failure count.



	lesb_vlink_fail:  Link Error Status Block (LESB) virtual link

	lesb/vlink_fail:  Link Error Status Block (LESB) virtual link

			  failure count.



	lesb_miss_fka:    Link Error Status Block (LESB) missed FCoE

	lesb/miss_fka:    Link Error Status Block (LESB) missed FCoE

			  Initialization Protocol (FIP) Keep-Alives (FKA).



	lesb_symb_err:    Link Error Status Block (LESB) symbolic error count.

	lesb/symb_err:    Link Error Status Block (LESB) symbolic error count.



	lesb_err_block:   Link Error Status Block (LESB) block error count.

	lesb/err_block:   Link Error Status Block (LESB) block error count.



	lesb_fcs_error:   Link Error Status Block (LESB) Fibre Channel

	lesb/fcs_error:   Link Error Status Block (LESB) Fibre Channel

			  Serivces error count.



Notes: ctlr_X (global increment starting at 0)