Skip to content

Commit 3bd7bf1

Browse files
author
Jiri Kosina
committed
Merge branch 'master' into for-next
Sync up with Linus' tree to be able to apply Cesar's patch against newer version of the code. Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2 parents f16f849 + e657e07 commit 3bd7bf1

13,374 files changed

Lines changed: 701046 additions & 382099 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,11 @@ GTAGS
8484
*.orig
8585
*~
8686
\#*#
87+
88+
#
89+
# Leavings from module signing
90+
#
91+
extra_certificates
92+
signing_key.priv
93+
signing_key.x509
94+
x509.genkey

‎Documentation/00-INDEX‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,8 @@ local_ops.txt
210210
- semantics and behavior of local atomic operations.
211211
lockdep-design.txt
212212
- documentation on the runtime locking correctness validator.
213+
lockup-watchdogs.txt
214+
- info on soft and hard lockup detectors (aka nmi_watchdog).
213215
logo.gif
214216
- full colour GIF image of Linux logo (penguin - Tux).
215217
logo.txt
@@ -240,8 +242,6 @@ netlabel/
240242
- directory with information on the NetLabel subsystem.
241243
networking/
242244
- directory with info on various aspects of networking with Linux.
243-
nmi_watchdog.txt
244-
- info on NMI watchdog for SMP systems.
245245
nommu-mmap.txt
246246
- documentation about no-mmu memory mapping support.
247247
numastat.txt
@@ -270,8 +270,6 @@ preempt-locking.txt
270270
- info on locking under a preemptive kernel.
271271
printk-formats.txt
272272
- how to get printk format specifiers right
273-
prio_tree.txt
274-
- info on radix-priority-search-tree use for indexing vmas.
275273
ramoops.txt
276274
- documentation of the ramoops oops/panic logging module.
277275
rbtree.txt

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎Documentation/ABI/testing/ima_policy‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,48 +12,65 @@ Description:
1212
then closing the file. The new policy takes effect after
1313
the file ima/policy is closed.
1414

15+
IMA appraisal, if configured, uses these file measurements
16+
for local measurement appraisal.
17+
1518
rule format: action [condition ...]
1619

17-
action: measure | dont_measure
20+
action: measure | dont_measure | appraise | dont_appraise | audit
1821
condition:= base | lsm
19-
base: [[func=] [mask=] [fsmagic=] [uid=]]
22+
base: [[func=] [mask=] [fsmagic=] [uid=] [fowner]]
2023
lsm: [[subj_user=] [subj_role=] [subj_type=]
2124
[obj_user=] [obj_role=] [obj_type=]]
2225

2326
base: func:= [BPRM_CHECK][FILE_MMAP][FILE_CHECK]
2427
mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
2528
fsmagic:= hex value
2629
uid:= decimal value
30+
fowner:=decimal value
2731
lsm: are LSM specific
2832

2933
default policy:
3034
# PROC_SUPER_MAGIC
3135
dont_measure fsmagic=0x9fa0
36+
dont_appraise fsmagic=0x9fa0
3237
# SYSFS_MAGIC
3338
dont_measure fsmagic=0x62656572
39+
dont_appraise fsmagic=0x62656572
3440
# DEBUGFS_MAGIC
3541
dont_measure fsmagic=0x64626720
42+
dont_appraise fsmagic=0x64626720
3643
# TMPFS_MAGIC
3744
dont_measure fsmagic=0x01021994
45+
dont_appraise fsmagic=0x01021994
46+
# RAMFS_MAGIC
47+
dont_measure fsmagic=0x858458f6
48+
dont_appraise fsmagic=0x858458f6
3849
# SECURITYFS_MAGIC
3950
dont_measure fsmagic=0x73636673
51+
dont_appraise fsmagic=0x73636673
4052

4153
measure func=BPRM_CHECK
4254
measure func=FILE_MMAP mask=MAY_EXEC
4355
measure func=FILE_CHECK mask=MAY_READ uid=0
56+
appraise fowner=0
4457

4558
The default policy measures all executables in bprm_check,
4659
all files mmapped executable in file_mmap, and all files
47-
open for read by root in do_filp_open.
60+
open for read by root in do_filp_open. The default appraisal
61+
policy appraises all files owned by root.
4862

4963
Examples of LSM specific definitions:
5064

5165
SELinux:
5266
# SELINUX_MAGIC
53-
dont_measure fsmagic=0xF97CFF8C
67+
dont_measure fsmagic=0xf97cff8c
68+
dont_appraise fsmagic=0xf97cff8c
5469

5570
dont_measure obj_type=var_log_t
71+
dont_appraise obj_type=var_log_t
5672
dont_measure obj_type=auditd_log_t
73+
dont_appraise obj_type=auditd_log_t
5774
measure subj_user=system_u func=FILE_CHECK mask=MAY_READ
5875
measure subj_role=system_r func=FILE_CHECK mask=MAY_READ
5976

‎Documentation/ABI/testing/sysfs-block‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,3 +206,17 @@ Description:
206206
when a discarded area is read the discard_zeroes_data
207207
parameter will be set to one. Otherwise it will be 0 and
208208
the result of reading a discarded area is undefined.
209+
210+
What: /sys/block/<disk>/queue/write_same_max_bytes
211+
Date: January 2012
212+
Contact: Martin K. Petersen <martin.petersen@oracle.com>
213+
Description:
214+
Some devices support a write same operation in which a
215+
single data block can be written to a range of several
216+
contiguous blocks on storage. This can be used to wipe
217+
areas on disk or to initialize drives in a RAID
218+
configuration. write_same_max_bytes indicates how many
219+
bytes can be written in a single write same command. If
220+
write_same_max_bytes is 0, write same is not supported
221+
by the device.
222+

‎Documentation/ABI/testing/sysfs-bus-fcoe‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ Attributes:
99
this value will change the dev_loss_tmo for all
1010
FCFs discovered by this controller.
1111

12-
lesb_link_fail: Link Error Status Block (LESB) link failure count.
12+
lesb/link_fail: Link Error Status Block (LESB) link failure count.
1313

14-
lesb_vlink_fail: Link Error Status Block (LESB) virtual link
14+
lesb/vlink_fail: Link Error Status Block (LESB) virtual link
1515
failure count.
1616

17-
lesb_miss_fka: Link Error Status Block (LESB) missed FCoE
17+
lesb/miss_fka: Link Error Status Block (LESB) missed FCoE
1818
Initialization Protocol (FIP) Keep-Alives (FKA).
1919

20-
lesb_symb_err: Link Error Status Block (LESB) symbolic error count.
20+
lesb/symb_err: Link Error Status Block (LESB) symbolic error count.
2121

22-
lesb_err_block: Link Error Status Block (LESB) block error count.
22+
lesb/err_block: Link Error Status Block (LESB) block error count.
2323

24-
lesb_fcs_error: Link Error Status Block (LESB) Fibre Channel
24+
lesb/fcs_error: Link Error Status Block (LESB) Fibre Channel
2525
Serivces error count.
2626

2727
Notes: ctlr_X (global increment starting at 0)

‎Documentation/ABI/testing/sysfs-bus-rbd‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ client_id
2525

2626
The ceph unique client id that was assigned for this specific session.
2727

28+
features
29+
30+
A hexadecimal encoding of the feature bits for this image.
31+
2832
major
2933

3034
The block device major number.
@@ -33,6 +37,11 @@ name
3337

3438
The name of the rbd image.
3539

40+
image_id
41+
42+
The unique id for the rbd image. (For rbd image format 1
43+
this is empty.)
44+
3645
pool
3746

3847
The name of the storage pool where this rbd image resides.
@@ -57,12 +66,6 @@ current_snap
5766

5867
The current snapshot for which the device is mapped.
5968

60-
create_snap
61-
62-
Create a snapshot:
63-
64-
$ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create
65-
6669
snap_*
6770

6871
A directory per each snapshot
@@ -79,4 +82,7 @@ snap_size
7982

8083
The size of the image when this snapshot was taken.
8184

85+
snap_features
86+
87+
A hexadecimal encoding of the feature bits for this snapshot.
8288

‎Documentation/ABI/testing/sysfs-bus-usb‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,3 +220,10 @@ Description:
220220
If the device doesn't support LTM, the file will read "no".
221221
The file will be present for all speeds of USB devices, and will
222222
always read "no" for USB 1.1 and USB 2.0 devices.
223+
224+
What: /sys/bus/usb/devices/.../(hub interface)/portX
225+
Date: August 2012
226+
Contact: Lan Tianyu <tianyu.lan@intel.com>
227+
Description:
228+
The /sys/bus/usb/devices/.../(hub interface)/portX
229+
is usb port device's sysfs directory.

‎Documentation/ABI/testing/sysfs-class-extcon‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Description:
1313
accessory cables have such capability. For example,
1414
the 30-pin port of Nuri board (/arch/arm/mach-exynos)
1515
may have both HDMI and Charger attached, or analog audio,
16-
video, and USB cables attached simulteneously.
16+
video, and USB cables attached simultaneously.
1717

1818
If there are cables mutually exclusive with each other,
1919
such binary relations may be expressed with extcon_dev's
@@ -35,7 +35,7 @@ Description:
3535
The /sys/class/extcon/.../state shows and stores the cable
3636
attach/detach information of the corresponding extcon object.
3737
If the extcon object has an optional callback "show_state"
38-
defined, the showing function is overriden with the optional
38+
defined, the showing function is overridden with the optional
3939
callback.
4040

4141
If the default callback for showing function is used, the
@@ -46,19 +46,19 @@ Description:
4646
TA=1
4747
EAR_JACK=0
4848
#
49-
In this example, the extcon device have USB_OTG and TA
49+
In this example, the extcon device has USB_OTG and TA
5050
cables attached and HDMI and EAR_JACK cables detached.
5151

5252
In order to update the state of an extcon device, enter a hex
53-
state number starting with 0x.
54-
echo 0xHEX > state
53+
state number starting with 0x:
54+
# echo 0xHEX > state
5555

56-
This updates the whole state of the extcon dev.
56+
This updates the whole state of the extcon device.
5757
Inputs of all the methods are required to meet the
58-
mutually_exclusive contidions if they exist.
58+
mutually_exclusive conditions if they exist.
5959

6060
It is recommended to use this "global" state interface if
61-
you need to enter the value atomically. The later state
61+
you need to set the value atomically. The later state
6262
interface associated with each cable cannot update
6363
multiple cable states of an extcon device simultaneously.
6464

@@ -73,7 +73,7 @@ What: /sys/class/extcon/.../cable.x/state
7373
Date: February 2012
7474
Contact: MyungJoo Ham <myungjoo.ham@samsung.com>
7575
Description:
76-
The /sys/class/extcon/.../cable.x/name shows and stores the
76+
The /sys/class/extcon/.../cable.x/state shows and stores the
7777
state of cable "x" (integer between 0 and 31) of an extcon
7878
device. The state value is either 0 (detached) or 1
7979
(attached).
@@ -83,8 +83,8 @@ Date: December 2011
8383
Contact: MyungJoo Ham <myungjoo.ham@samsung.com>
8484
Description:
8585
Shows the relations of mutually exclusiveness. For example,
86-
if the mutually_exclusive array of extcon_dev is
87-
{0x3, 0x5, 0xC, 0x0}, the, the output is:
86+
if the mutually_exclusive array of extcon device is
87+
{0x3, 0x5, 0xC, 0x0}, then the output is:
8888
# ls mutually_exclusive/
8989
0x3
9090
0x5

‎Documentation/ABI/testing/sysfs-devices-firmware_node‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
What: /sys/devices/.../firmware_node/
2+
Date: September 2012
3+
Contact: <>
4+
Description:
5+
The /sys/devices/.../firmware_node directory contains attributes
6+
allowing the user space to check and modify some firmware
7+
related properties of given device.
8+
9+
What: /sys/devices/.../firmware_node/description
10+
Date: September 2012
11+
Contact: Lance Ortiz <lance.ortiz@hp.com>
12+
Description:
13+
The /sys/devices/.../firmware/description attribute contains a string
14+
that describes the device as provided by the _STR method in the ACPI
15+
namespace. This attribute is read-only. If the device does not have
16+
an _STR method associated with it in the ACPI namespace, this
17+
attribute is not present.

0 commit comments

Comments
 (0)