---

yaml
---
r: 347894
b: refs/heads/master
c: d8153d4
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c9a44aebeaef35570a67aed17b72a2cf8d0b219
+refs/heads/master: d8153d4d8b7b6141770e1416c4a338161205ed1b

trunk/.gitignore

@@ -60,6 +60,7 @@ modules.builtin
 # Generated include files
 #
 include/config
+include/linux/version.h
 include/generated
 arch/*/include/generated
 
@@ -83,11 +84,3 @@ GTAGS
 *.orig
 *~
 \#*#
-
-#
-# Leavings from module signing
-#
-extra_certificates
-signing_key.priv
-signing_key.x509
-x509.genkey

trunk/CREDITS

@@ -1823,11 +1823,6 @@ 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

trunk/Documentation/00-INDEX

@@ -136,6 +136,8 @@ 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/
@@ -208,8 +210,6 @@ 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,6 +240,8 @@ 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
@@ -268,6 +270,8 @@ 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

trunk/Documentation/ABI/README

@@ -36,6 +36,9 @@ 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

trunk/Documentation/ABI/obsolete/proc-pid-oom_adj

@@ -0,0 +1,22 @@
+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.

trunk/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus

@@ -8,41 +8,3 @@ Description:	The integer value of this attribute ranges from 0-4.
 		When written, this file sets the number of the startup profile
 		and the mouse activates this profile immediately.
 		Please use actual_profile, it does the same thing.
-Users:		http://roccat.sourceforge.net
-
-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/firmware_version
-Date:		October 2010
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	When read, this file returns the raw integer version number of the
-		firmware reported by the mouse. Using the integer value eases
-		further usage in other programs. To receive the real version
-		number the decimal point has to be shifted 2 positions to the
-		left. E.g. a returned value of 121 means 1.21
-		This file is readonly.
-		Please read binary attribute info which contains firmware version.
-Users:		http://roccat.sourceforge.net
-
-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/profile[1-5]_buttons
-Date:		August 2010
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	The mouse can store 5 profiles which can be switched by the
-		press of a button. A profile is split in settings and buttons.
-		profile_buttons holds information about button layout.
-		When read, these files return the respective profile buttons.
-		The returned data is 77 bytes in size.
-		This file is readonly.
-		Write control to select profile and read profile_buttons instead.
-Users:		http://roccat.sourceforge.net
-
-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/profile[1-5]_settings
-Date:		August 2010
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	The mouse can store 5 profiles which can be switched by the
-		press of a button. A profile is split in settings and buttons.
-		profile_settings holds information like resolution, sensitivity
-		and light effects.
-		When read, these files return the respective profile settings.
-		The returned data is 43 bytes in size.
-		This file is readonly.
-		Write control to select profile and read profile_settings instead.
-Users:		http://roccat.sourceforge.net

trunk/Documentation/ABI/stable/sysfs-devices-node

@@ -1,101 +1,7 @@
-What:		/sys/devices/system/node/possible
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		Nodes that could be possibly become online at some point.
-
-What:		/sys/devices/system/node/online
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		Nodes that are online.
-
-What:		/sys/devices/system/node/has_normal_memory
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		Nodes that have regular memory.
-
-What:		/sys/devices/system/node/has_cpu
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		Nodes that have one or more CPUs.
-
-What:		/sys/devices/system/node/has_high_memory
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		Nodes that have regular or high memory.
-		Depends on CONFIG_HIGHMEM.
-
 What:		/sys/devices/system/node/nodeX
 Date:		October 2002
 Contact:	Linux Memory Management list <linux-mm@kvack.org>
 Description:
 		When CONFIG_NUMA is enabled, this is a directory containing
 		information on node X such as what CPUs are local to the
-		node. Each file is detailed next.
-
-What:		/sys/devices/system/node/nodeX/cpumap
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		The node's cpumap.
-
-What:		/sys/devices/system/node/nodeX/cpulist
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		The CPUs associated to the node.
-
-What:		/sys/devices/system/node/nodeX/meminfo
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		Provides information about the node's distribution and memory
-		utilization. Similar to /proc/meminfo, see Documentation/filesystems/proc.txt
-
-What:		/sys/devices/system/node/nodeX/numastat
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		The node's hit/miss statistics, in units of pages.
-		See Documentation/numastat.txt
-
-What:		/sys/devices/system/node/nodeX/distance
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		Distance between the node and all the other nodes
-		in the system.
-
-What:		/sys/devices/system/node/nodeX/vmstat
-Date:		October 2002
-Contact:	Linux Memory Management list <linux-mm@kvack.org>
-Description:
-		The node's zoned virtual memory statistics.
-		This is a superset of numastat.
-
-What:		/sys/devices/system/node/nodeX/compact
-Date:		February 2010
-Contact:	Mel Gorman <mel@csn.ul.ie>
-Description:
-		When this file is written to, all memory within that node
-		will be compacted. When it completes, memory will be freed
-		into blocks which have as many contiguous pages as possible
-
-What:		/sys/devices/system/node/nodeX/scan_unevictable_pages
-Date:		October 2008
-Contact:	Lee Schermerhorn <lee.schermerhorn@hp.com>
-Description:
-		When set, it triggers scanning the node's unevictable lists
-		and move any pages that have become evictable onto the respective
-		zone's inactive list. See mm/vmscan.c
-
-What:		/sys/devices/system/node/nodeX/hugepages/hugepages-<size>/
-Date:		December 2009
-Contact:	Lee Schermerhorn <lee.schermerhorn@hp.com>
-Description:
-		The node's huge page size control/query attributes.
-		See Documentation/vm/hugetlbpage.txt
+		node.