summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-01-28 12:42:24 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2014-01-28 13:02:27 +1100
commit61fea716ed0087e95fe7e96eef82fe35029103fc (patch)
tree7812f93480463cad1bcdd9b7bfcafd094bed229a /Documentation
parente9354255e8fea409b3de544fc1c46b7f2b1f202e (diff)
parent0fc6f4e2e3d58ccf7439a0bdda8f6fb9cecc2d5d (diff)
Merge branch 'akpm-current/current'
Conflicts: Documentation/devicetree/bindings/vendor-prefixes.txt Documentation/kernel-parameters.txt Documentation/sysctl/kernel.txt arch/x86/mm/srat.c include/linux/vm_event_item.h lib/percpu_counter.c lib/vsprintf.c mm/memcontrol.c mm/nobootmem.c mm/oom_kill.c mm/page_alloc.c mm/rmap.c
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/vfat.txt10
-rw-r--r--Documentation/leds/leds-class.txt3
-rw-r--r--Documentation/printk-formats.txt6
3 files changed, 16 insertions, 3 deletions
diff --git a/Documentation/filesystems/vfat.txt b/Documentation/filesystems/vfat.txt
index 4a93e98b290a..5cf57b368dc6 100644
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
@@ -175,6 +175,16 @@ nfs=stale_rw|nostale_ro
<bool>: 0,1,yes,no,true,false
+LIMITATION
+---------------------------------------------------------------------
+* The fallocated region of file is discarded at umount/evict time
+ when using fallocate with FALLOC_FL_KEEP_SIZE.
+ So, User should assume that fallocated region can be discarded at
+ last close if there is memory pressure resulting in eviction of
+ the inode from the memory. As a result, for any dependency on
+ the fallocated region, user should make sure to recheck fallocate
+ after reopening the file.
+
TODO
----------------------------------------------------------------------
* Need to get rid of the raw scanning stuff. Instead, always use
diff --git a/Documentation/leds/leds-class.txt b/Documentation/leds/leds-class.txt
index 79699c200766..62261c04060a 100644
--- a/Documentation/leds/leds-class.txt
+++ b/Documentation/leds/leds-class.txt
@@ -2,9 +2,6 @@
LED handling under Linux
========================
-If you're reading this and thinking about keyboard leds, these are
-handled by the input subsystem and the led class is *not* needed.
-
In its simplest form, the LED class just allows control of LEDs from
userspace. LEDs appear in /sys/class/leds/. The maximum brightness of the
LED is defined in max_brightness file. The brightness file will set the brightness
diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
index 6f4eb322ffaf..94459b42e0ab 100644
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
@@ -184,6 +184,12 @@ dentry names:
equivalent of %s dentry->d_name.name we used to use, %pd<n> prints
n last components. %pD does the same thing for struct file.
+task_struct comm name:
+
+ %pT
+
+ For printing task_struct->comm.
+
struct va_format:
%pV