Merge tag 'v3.8-rc2' into next (cf9ce948) · Commits · e / devices / android_kernel_xiaomi_markw

.gitignore

+8 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ modules.builtin
		# Generated include files
		#
		include/config
		include/linux/version.h
		include/generated
		arch/*/include/generated

		@@ -84,3 +83,11 @@ GTAGS
		*.orig
		*~
		\#*#

		#
		# Leavings from module signing
		#
		extra_certificates
		signing_key.priv
		signing_key.x509
		x509.genkey

+5 −0

Original line number	Diff line number	Diff line
		@@ -1823,6 +1823,11 @@ S: Kattreinstr 38
		S: D-64295
		S: Germany

		N: Avi Kivity
		E: avi.kivity@gmail.com
		D: Kernel-based Virtual Machine (KVM)
		S: Ra'annana, Israel

		N: Andi Kleen
		E: andi@firstfloor.org
		U: http://www.halobates.de

+2 −6

Original line number	Diff line number	Diff line
		@@ -136,8 +136,6 @@ fault-injection/
		- dir with docs about the fault injection capabilities infrastructure.
		fb/
		- directory with info on the frame buffer graphics abstraction layer.
		feature-removal-schedule.txt
		- list of files and features that are going to be removed.
		filesystems/
		- info on the vfs and the various filesystems that Linux supports.
		firmware_class/
		@@ -210,6 +208,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 +240,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 +268,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

+0 −3

Original line number	Diff line number	Diff line
		@@ -36,9 +36,6 @@ The different levels of stability are:
		the kernel, but are marked to be removed at some later point in
		time. The description of the interface will document the reason
		why it is obsolete and when it can be expected to be removed.
		The file Documentation/feature-removal-schedule.txt may describe
		some of these interfaces, giving a schedule for when they will
		be removed.

		removed/
		This directory contains a list of the old interfaces that have

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.