aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-26 00:00:19 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-26 00:00:19 -0400
commit45b583b10a8b438b970e95a7d1d4db22c9e35004 (patch)
tree14fa481598289df0459580c582b48a9d95db51f6 /Documentation
parent154dd78d30b56ffb8b447f629bfcceb14150e5c4 (diff)
parentf19da2ce8ef5e49b8b8ea199c3601dd45d71b262 (diff)
Merge 'akpm' patch series
* Merge akpm patch series: (122 commits) drivers/connector/cn_proc.c: remove unused local Documentation/SubmitChecklist: add RCU debug config options reiserfs: use hweight_long() reiserfs: use proper little-endian bitops pnpacpi: register disabled resources drivers/rtc/rtc-tegra.c: properly initialize spinlock drivers/rtc/rtc-twl.c: check return value of twl_rtc_write_u8() in twl_rtc_set_time() drivers/rtc: add support for Qualcomm PMIC8xxx RTC drivers/rtc/rtc-s3c.c: support clock gating drivers/rtc/rtc-mpc5121.c: add support for RTC on MPC5200 init: skip calibration delay if previously done misc/eeprom: add eeprom access driver for digsy_mtc board misc/eeprom: add driver for microwire 93xx46 EEPROMs checkpatch.pl: update $logFunctions checkpatch: make utf-8 test --strict checkpatch.pl: add ability to ignore various messages checkpatch: add a "prefer __aligned" check checkpatch: validate signature styles and To: and Cc: lines checkpatch: add __rcu as a sparse modifier checkpatch: suggest using min_t or max_t ... Did this as a merge because of (trivial) conflicts in - Documentation/feature-removal-schedule.txt - arch/xtensa/include/asm/uaccess.h that were just easier to fix up in the merge than in the patch series.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/ABI/obsolete/proc-pid-oom_adj2
-rw-r--r--Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa948021
-rw-r--r--Documentation/SubmitChecklist4
-rw-r--r--Documentation/feature-removal-schedule.txt18
4 files changed, 25 insertions, 20 deletions
diff --git a/Documentation/ABI/obsolete/proc-pid-oom_adj b/Documentation/ABI/obsolete/proc-pid-oom_adj
index cf63f264ce0f..9a3cb88ade47 100644
--- a/Documentation/ABI/obsolete/proc-pid-oom_adj
+++ b/Documentation/ABI/obsolete/proc-pid-oom_adj
@@ -14,7 +14,7 @@ Why: /proc/<pid>/oom_adj allows userspace to influence the oom killer's
14 14
15 A much more powerful interface, /proc/<pid>/oom_score_adj, was 15 A much more powerful interface, /proc/<pid>/oom_score_adj, was
16 introduced with the oom killer rewrite that allows users to increase or 16 introduced with the oom killer rewrite that allows users to increase or
17 decrease the badness() score linearly. This interface will replace 17 decrease the badness score linearly. This interface will replace
18 /proc/<pid>/oom_adj. 18 /proc/<pid>/oom_adj.
19 19
20 A warning will be emitted to the kernel log if an application uses this 20 A warning will be emitted to the kernel log if an application uses this
diff --git a/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480 b/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480
new file mode 100644
index 000000000000..9de269bb0ae5
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480
@@ -0,0 +1,21 @@
1What: /sys/bus/i2c/devices/.../device
2Date: February 2011
3Contact: Minkyu Kang <mk7.kang@samsung.com>
4Description:
5 show what device is attached
6 NONE - no device
7 USB - USB device is attached
8 UART - UART is attached
9 CHARGER - Charger is attaced
10 JIG - JIG is attached
11
12What: /sys/bus/i2c/devices/.../switch
13Date: February 2011
14Contact: Minkyu Kang <mk7.kang@samsung.com>
15Description:
16 show or set the state of manual switch
17 VAUDIO - switch to VAUDIO path
18 UART - switch to UART path
19 AUDIO - switch to AUDIO path
20 DHOST - switch to DHOST path
21 AUTO - switch automatically by device
diff --git a/Documentation/SubmitChecklist b/Documentation/SubmitChecklist
index 7b13be41c085..dc0e33210d7e 100644
--- a/Documentation/SubmitChecklist
+++ b/Documentation/SubmitChecklist
@@ -53,8 +53,8 @@ kernel patches.
53 53
5412: Has been tested with CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT, 5412: Has been tested with CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT,
55 CONFIG_DEBUG_SLAB, CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES, 55 CONFIG_DEBUG_SLAB, CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES,
56 CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_ATOMIC_SLEEP all simultaneously 56 CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_ATOMIC_SLEEP, CONFIG_PROVE_RCU
57 enabled. 57 and CONFIG_DEBUG_OBJECTS_RCU_HEAD all simultaneously enabled.
58 58
5913: Has been build- and runtime tested with and without CONFIG_SMP and 5913: Has been build- and runtime tested with and without CONFIG_SMP and
60 CONFIG_PREEMPT. 60 CONFIG_PREEMPT.
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index c8616f741746..89e46d3dc642 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -184,7 +184,7 @@ Why: /proc/<pid>/oom_adj allows userspace to influence the oom killer's
184 184
185 A much more powerful interface, /proc/<pid>/oom_score_adj, was 185 A much more powerful interface, /proc/<pid>/oom_score_adj, was
186 introduced with the oom killer rewrite that allows users to increase or 186 introduced with the oom killer rewrite that allows users to increase or
187 decrease the badness() score linearly. This interface will replace 187 decrease the badness score linearly. This interface will replace
188 /proc/<pid>/oom_adj. 188 /proc/<pid>/oom_adj.
189 189
190 A warning will be emitted to the kernel log if an application uses this 190 A warning will be emitted to the kernel log if an application uses this
@@ -518,22 +518,6 @@ Files: net/netfilter/xt_connlimit.c
518 518
519---------------------------- 519----------------------------
520 520
521What: noswapaccount kernel command line parameter
522When: 3.0
523Why: The original implementation of memsw feature enabled by
524 CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount
525 kernel parameter (introduced in 2.6.29-rc1). Later on, this decision
526 turned out to be not ideal because we cannot have the feature compiled
527 in and disabled by default and let only interested to enable it
528 (e.g. general distribution kernels might need it). Therefore we have
529 added swapaccount[=0|1] parameter (introduced in 2.6.37) which provides
530 the both possibilities. If we remove noswapaccount we will have
531 less command line parameters with the same functionality and we
532 can also cleanup the parameter handling a bit ().
533Who: Michal Hocko <mhocko@suse.cz>
534
535----------------------------
536
537What: ipt_addrtype match include file 521What: ipt_addrtype match include file
538When: 2012 522When: 2012
539Why: superseded by xt_addrtype 523Why: superseded by xt_addrtype