71 files changed, 2947 insertions, 1053 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-event_source-devices-events b/Documentation/ABI/testing/sysfs-bus-event_source-devices-events
index 0adeb524c0d4..8b25ffb42562 100644
--- a/Documentation/ABI/testing/sysfs-bus-event_source-devices-events
+++ b/Documentation/ABI/testing/sysfs-bus-event_source-devices-events
@@ -27,14 +27,36 @@ Description:	Generic performance monitoring events
                 "basename".
 
 
-What:           /sys/devices/cpu/events/PM_LD_MISS_L1
-                /sys/devices/cpu/events/PM_LD_REF_L1
-                /sys/devices/cpu/events/PM_CYC
+What:           /sys/devices/cpu/events/PM_1PLUS_PPC_CMPL
                 /sys/devices/cpu/events/PM_BRU_FIN
-                /sys/devices/cpu/events/PM_GCT_NOSLOT_CYC
                 /sys/devices/cpu/events/PM_BRU_MPRED
-                /sys/devices/cpu/events/PM_INST_CMPL
                 /sys/devices/cpu/events/PM_CMPLU_STALL
+                /sys/devices/cpu/events/PM_CMPLU_STALL_BRU
+                /sys/devices/cpu/events/PM_CMPLU_STALL_DCACHE_MISS
+                /sys/devices/cpu/events/PM_CMPLU_STALL_DFU
+                /sys/devices/cpu/events/PM_CMPLU_STALL_DIV
+                /sys/devices/cpu/events/PM_CMPLU_STALL_ERAT_MISS
+                /sys/devices/cpu/events/PM_CMPLU_STALL_FXU
+                /sys/devices/cpu/events/PM_CMPLU_STALL_IFU
+                /sys/devices/cpu/events/PM_CMPLU_STALL_LSU
+                /sys/devices/cpu/events/PM_CMPLU_STALL_REJECT
+                /sys/devices/cpu/events/PM_CMPLU_STALL_SCALAR
+                /sys/devices/cpu/events/PM_CMPLU_STALL_SCALAR_LONG
+                /sys/devices/cpu/events/PM_CMPLU_STALL_STORE
+                /sys/devices/cpu/events/PM_CMPLU_STALL_THRD
+                /sys/devices/cpu/events/PM_CMPLU_STALL_VECTOR
+                /sys/devices/cpu/events/PM_CMPLU_STALL_VECTOR_LONG
+                /sys/devices/cpu/events/PM_CYC
+                /sys/devices/cpu/events/PM_GCT_NOSLOT_BR_MPRED
+                /sys/devices/cpu/events/PM_GCT_NOSLOT_BR_MPRED_IC_MISS
+                /sys/devices/cpu/events/PM_GCT_NOSLOT_CYC
+                /sys/devices/cpu/events/PM_GCT_NOSLOT_IC_MISS
+                /sys/devices/cpu/events/PM_GRP_CMPL
+                /sys/devices/cpu/events/PM_INST_CMPL
+                /sys/devices/cpu/events/PM_LD_MISS_L1
+                /sys/devices/cpu/events/PM_LD_REF_L1
+                /sys/devices/cpu/events/PM_RUN_CYC
+                /sys/devices/cpu/events/PM_RUN_INST_CMPL
 
 Date:           2013/01/08
 
diff --git a/Documentation/ABI/testing/sysfs-bus-event_source-devices-format b/Documentation/ABI/testing/sysfs-bus-event_source-devices-format
index 079afc71363d..77f47ff5ee02 100644
--- a/Documentation/ABI/testing/sysfs-bus-event_source-devices-format
+++ b/Documentation/ABI/testing/sysfs-bus-event_source-devices-format
@@ -9,6 +9,12 @@ Description:
                 we want to export, so that userspace can deal with sane
                 name/value pairs.
 
+                Userspace must be prepared for the possibility that attributes
+                define overlapping bit ranges. For example:
+                        attr1 = 'config:0-23'
+                        attr2 = 'config:0-7'
+                        attr3 = 'config:12-35'
+
                 Example: 'config1:1,6-10,44'
                 Defines contents of attribute that occupies bits 1,6-10,44 of
                 perf_event_attr::config1.
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index ccd42589e124..ab7d16efa96b 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -70,12 +70,12 @@ show up in /proc/sys/kernel:
 - shmall
 - shmmax                      [ sysv ipc ]
 - shmmni
-- softlockup_thresh