Skip to content

Commit 067e260

Browse files
author
Jiri Kosina
committed
Merge branch 'for-4.3/gembird' into for-linus
2 parents 3e097d1 + 931830a commit 067e260

File tree

9,559 files changed

+994703
-225605
lines changed

Some content is hidden

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

9,559 files changed

+994703
-225605
lines changed

‎.mailmap

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ Mayuresh Janorkar <[email protected]>
8484
Michael Buesch <[email protected]>
8585
Michel Dänzer <[email protected]>
8686
Mitesh shah <[email protected]>
87+
Mohit Kumar <[email protected]> <[email protected]>
8788
Morten Welinder <[email protected]>
8889
Morten Welinder <[email protected]>
8990
Morten Welinder <[email protected]>
@@ -95,10 +96,12 @@ Patrick Mochel <[email protected]>
9596
Peter A Jonsson <[email protected]>
9697
Peter Oruba <[email protected]>
9798
Peter Oruba <[email protected]>
99+
Pratyush Anand <[email protected]> <[email protected]>
98100
Praveen BP <[email protected]>
99101
Rajesh Shah <[email protected]>
100102
Ralf Baechle <[email protected]>
101103
Ralf Wildenhues <[email protected]>
104+
Randy Dunlap <[email protected]> <[email protected]>
102105
Rémi Denis-Courmont <[email protected]>
103106
Ricardo Ribalda Delgado <[email protected]>
104107
Rudolf Marek <[email protected]>
@@ -113,6 +116,7 @@ Shiraz Hashim <[email protected]> <[email protected]>
113116
Simon Kelley <[email protected]>
114117
Stéphane Witzmann <[email protected]>
115118
Stephen Hemminger <[email protected]>
119+
Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
116120
Sumit Semwal <[email protected]>
117121
Tejun Heo <[email protected]>
118122
Thomas Graf <[email protected]>
@@ -122,7 +126,9 @@ Uwe Kleine-König <[email protected]>
122126
Uwe Kleine-König <[email protected]>
123127
Uwe Kleine-König <[email protected]>
124128
Valdis Kletnieks <[email protected]>
125-
Viresh Kumar <[email protected]> <[email protected]>
129+
Viresh Kumar <[email protected]> <[email protected]>
130+
Viresh Kumar <[email protected]> <[email protected]>
131+
Viresh Kumar <[email protected]> <[email protected]>
126132
Takashi YOSHII <[email protected]>
127133
Yusuke Goda <[email protected]>
128134
Gustavo Padovan <[email protected]>

‎CREDITS

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2740,6 +2740,10 @@ S: C/ Mieses 20, 9-B
27402740
S: Valladolid 47009
27412741
S: Spain
27422742

2743+
N: Jens Osterkamp
2744+
E: [email protected]
2745+
D: Maintainer of Spidernet network driver for Cell
2746+
27432747
N: Gadi Oxman
27442748
E: [email protected]
27452749
D: Original author and maintainer of IDE/ATAPI floppy/tape drivers
@@ -3219,11 +3223,6 @@ N: Dipankar Sarma
32193223
E: [email protected]
32203224
D: RCU
32213225

3222-
N: Yoshinori Sato
3223-
E: [email protected]
3224-
D: uClinux for Renesas H8/300 (H8300)
3225-
D: http://uclinux-h8.sourceforge.jp/
3226-
32273226
N: Hannu Savolainen
32283227
E: [email protected]
32293228
D: Maintainer of the sound drivers until 2.1.x days.

‎Documentation/ABI/stable/sysfs-bus-w1

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
What: /sys/bus/w1/devices/.../w1_master_timeout_us
2+
Date: April 2015
3+
Contact: Dmitry Khromov <[email protected]>
4+
Description: Bus scanning interval, microseconds component.
5+
Some of 1-Wire devices commonly associated with physical access
6+
control systems are attached/generate presence for as short as
7+
100 ms - hence the tens-to-hundreds milliseconds scan intervals
8+
are required.
9+
see Documentation/w1/w1.generic for detailed information.
10+
Users: any user space application which wants to know bus scanning
11+
interval

‎Documentation/ABI/stable/sysfs-driver-w1_ds28ea00

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
What: /sys/bus/w1/devices/.../w1_seq
2+
Date: Apr 2015
3+
Contact: Matt Campbell <[email protected]>
4+
Description: Support for the DS28EA00 chain sequence function
5+
see Documentation/w1/slaves/w1_therm for detailed information
6+
Users: any user space application which wants to communicate with DS28EA00

‎Documentation/ABI/testing/configfs-spear-pcie-gadget

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /config/pcie-gadget
22
Date: Feb 2011
33
KernelVersion: 2.6.37
4-
Contact: Pratyush Anand <pratyush.anand@st.com>
4+
Contact: Pratyush Anand <pratyush.anand@gmail.com>
55
Description:
66

77
Interface is used to configure selected dual mode PCIe controller

‎Documentation/ABI/testing/dev-kmsg

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,13 @@ Description: The /dev/kmsg character device node provides userspace access
9898
logic is used internally when messages are printed to the
9999
console, /proc/kmsg or the syslog() syscall.
100100

101+
By default, kernel tries to avoid fragments by concatenating
102+
when it can and fragments are rare; however, when extended
103+
console support is enabled, the in-kernel concatenation is
104+
disabled and /dev/kmsg output will contain more fragments. If
105+
the log consumer performs concatenation, the end result
106+
should be the same. In the future, the in-kernel concatenation
107+
may be removed entirely and /dev/kmsg users are recommended to
108+
implement fragment handling.
109+
101110
Users: dmesg(1), userspace kernel log consumers

‎Documentation/ABI/testing/ima_policy

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,19 @@ Description:
2020
action: measure | dont_measure | appraise | dont_appraise | audit
2121
condition:= base | lsm [option]
2222
base: [[func=] [mask=] [fsmagic=] [fsuuid=] [uid=]
23-
[fowner]]
23+
[euid=] [fowner=]]
2424
lsm: [[subj_user=] [subj_role=] [subj_type=]
2525
[obj_user=] [obj_role=] [obj_type=]]
2626
option: [[appraise_type=]] [permit_directio]
2727

2828
base: func:= [BPRM_CHECK][MMAP_CHECK][FILE_CHECK][MODULE_CHECK]
2929
[FIRMWARE_CHECK]
30-
mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
30+
mask:= [[^]MAY_READ] [[^]MAY_WRITE] [[^]MAY_APPEND]
31+
[[^]MAY_EXEC]
3132
fsmagic:= hex value
3233
fsuuid:= file system UUID (e.g 8bcbe394-4f13-4144-be8e-5aa9ea2ce2f6)
3334
uid:= decimal value
35+
euid:= decimal value
3436
fowner:=decimal value
3537
lsm: are LSM specific
3638
option: appraise_type:= [imasig]
@@ -49,11 +51,25 @@ Description:
4951
dont_measure fsmagic=0x01021994
5052
dont_appraise fsmagic=0x01021994
5153
# RAMFS_MAGIC
52-
dont_measure fsmagic=0x858458f6
5354
dont_appraise fsmagic=0x858458f6
55+
# DEVPTS_SUPER_MAGIC
56+
dont_measure fsmagic=0x1cd1
57+
dont_appraise fsmagic=0x1cd1
58+
# BINFMTFS_MAGIC
59+
dont_measure fsmagic=0x42494e4d
60+
dont_appraise fsmagic=0x42494e4d
5461
# SECURITYFS_MAGIC
5562
dont_measure fsmagic=0x73636673
5663
dont_appraise fsmagic=0x73636673
64+
# SELINUX_MAGIC
65+
dont_measure fsmagic=0xf97cff8c
66+
dont_appraise fsmagic=0xf97cff8c
67+
# CGROUP_SUPER_MAGIC
68+
dont_measure fsmagic=0x27e0eb
69+
dont_appraise fsmagic=0x27e0eb
70+
# NSFS_MAGIC
71+
dont_measure fsmagic=0x6e736673
72+
dont_appraise fsmagic=0x6e736673
5773

5874
measure func=BPRM_CHECK
5975
measure func=FILE_MMAP mask=MAY_EXEC
@@ -70,10 +86,6 @@ Description:
7086
Examples of LSM specific definitions:
7187

7288
SELinux:
73-
# SELINUX_MAGIC
74-
dont_measure fsmagic=0xf97cff8c
75-
dont_appraise fsmagic=0xf97cff8c
76-
7789
dont_measure obj_type=var_log_t
7890
dont_appraise obj_type=var_log_t
7991
dont_measure obj_type=auditd_log_t

‎Documentation/ABI/testing/sysfs-ata

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,17 @@ gscr
9090
130: SATA_PMP_GSCR_SII_GPIO
9191
Only valid if the device is a PM.
9292

93+
trim
94+
95+
Shows the DSM TRIM mode currently used by the device. Valid
96+
values are:
97+
unsupported: Drive does not support DSM TRIM
98+
unqueued: Drive supports unqueued DSM TRIM only
99+
queued: Drive supports queued DSM TRIM
100+
forced_unqueued: Drive's queued DSM support is known to be
101+
buggy and only unqueued TRIM commands
102+
are sent
103+
93104
spdn_cnt
94105

95106
Number of time libata decided to lower the speed of link due to errors.

0 commit comments

Comments
 (0)