Skip to content

Commit a53a0ab

Browse files
tiwaitiwai
committed
Merge tag 'asoc-fix-v4.14-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.14 A bunch of fixes here, mostly device specific ones (the biggest one being the revert of the hotword support for rt5514), with a couple of core fixes for potential issues with corrupted or otherwise invalid topology files.
2 parents 1f20f9f + b817d93 commit a53a0ab

File tree

707 files changed

+7146
-4365
lines changed

Some content is hidden

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

707 files changed

+7146
-4365
lines changed

‎Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,11 @@ Description:
1414
Show or set the gain boost of the amp, from 0-31 range.
1515
18 = indoors (default)
1616
14 = outdoors
17+
18+
What /sys/bus/iio/devices/iio:deviceX/noise_level_tripped
19+
Date: May 2017
20+
KernelVersion: 4.13
21+
Contact: Matt Ranostay <matt.ranostay@konsulko.com>
22+
Description:
23+
When 1 the noise level is over the trip level and not reporting
24+
valid data

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,9 @@ Description:
211211
device, after it has been suspended at run time, from a resume
212212
request to the moment the device will be ready to process I/O,
213213
in microseconds. If it is equal to 0, however, this means that
214-
the PM QoS resume latency may be arbitrary.
214+
the PM QoS resume latency may be arbitrary and the special value
215+
"n/a" means that user space cannot accept any resume latency at
216+
all for the given device.
215217

216218
Not all drivers support this attribute. If it isn't supported,
217219
it is not present.

‎Documentation/ABI/testing/sysfs-kernel-mm-swap

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,3 @@ Description: Enable/disable VMA based swap readahead.
1414
still used for tmpfs etc. other users. If set to
1515
false, the global swap readahead algorithm will be
1616
used for all swappable pages.
17-
18-
What: /sys/kernel/mm/swap/vma_ra_max_order
19-
Date: August 2017
20-
Contact: Linux memory management mailing list <linux-mm@kvack.org>
21-
Description: The max readahead size in order for VMA based swap readahead
22-
23-
VMA based swap readahead algorithm will readahead at
24-
most 1 << max_order pages for each readahead. The
25-
real readahead size for each readahead will be scaled
26-
according to the estimation algorithm.

‎Documentation/core-api/kernel-api.rst

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -352,44 +352,30 @@ Read-Copy Update (RCU)
352352
----------------------
353353

354354
.. kernel-doc:: include/linux/rcupdate.h
355-
:external:
356355

357356
.. kernel-doc:: include/linux/rcupdate_wait.h
358-
:external:
359357

360358
.. kernel-doc:: include/linux/rcutree.h
361-
:external:
362359

363360
.. kernel-doc:: kernel/rcu/tree.c
364-
:external:
365361

366362
.. kernel-doc:: kernel/rcu/tree_plugin.h
367-
:external:
368363

369364
.. kernel-doc:: kernel/rcu/tree_exp.h
370-
:external:
371365

372366
.. kernel-doc:: kernel/rcu/update.c
373-
:external:
374367

375368
.. kernel-doc:: include/linux/srcu.h
376-
:external:
377369

378370
.. kernel-doc:: kernel/rcu/srcutree.c
379-
:external:
380371

381372
.. kernel-doc:: include/linux/rculist_bl.h
382-
:external:
383373

384374
.. kernel-doc:: include/linux/rculist.h
385-
:external:
386375

387376
.. kernel-doc:: include/linux/rculist_nulls.h
388-
:external:
389377

390378
.. kernel-doc:: include/linux/rcu_sync.h
391-
:external:
392379

393380
.. kernel-doc:: kernel/rcu/sync.c
394-
:external:
395381

‎Documentation/devicetree/bindings/iio/proximity/as3935.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ Optional properties:
1616
- ams,tuning-capacitor-pf: Calibration tuning capacitor stepping
1717
value 0 - 120pF. This will require using the calibration data from
1818
the manufacturer.
19+
- ams,nflwdth: Set the noise and watchdog threshold register on
20+
startup. This will need to set according to the noise from the
21+
MCU board, and possibly the local environment. Refer to the
22+
datasheet for the threshold settings.
1923

2024
Example:
2125

@@ -27,4 +31,5 @@ as3935@0 {
2731
interrupt-parent = <&gpio1>;
2832
interrupts = <16 1>;
2933
ams,tuning-capacitor-pf = <80>;
34+
ams,nflwdth = <0x44>;
3035
};

‎Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Examples:
9999
compatible = "arm,gic-v3-its";
100100
msi-controller;
101101
#msi-cells = <1>;
102-
reg = <0x0 0x2c200000 0 0x200000>;
102+
reg = <0x0 0x2c200000 0 0x20000>;
103103
};
104104
};
105105

@@ -124,14 +124,14 @@ Examples:
124124
compatible = "arm,gic-v3-its";
125125
msi-controller;
126126
#msi-cells = <1>;
127-
reg = <0x0 0x2c200000 0 0x200000>;
127+
reg = <0x0 0x2c200000 0 0x20000>;
128128
};
129129

130130
gic-its@2c400000 {
131131
compatible = "arm,gic-v3-its";
132132
msi-controller;
133133
#msi-cells = <1>;
134-
reg = <0x0 0x2c400000 0 0x200000>;
134+
reg = <0x0 0x2c400000 0 0x20000>;
135135
};
136136

137137
ppi-partitions {

‎Documentation/kbuild/makefiles.txt

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,14 +1108,6 @@ When kbuild executes, the following steps are followed (roughly):
11081108
ld
11091109
Link target. Often, LDFLAGS_$@ is used to set specific options to ld.
11101110

1111-
objcopy
1112-
Copy binary. Uses OBJCOPYFLAGS usually specified in
1113-
arch/$(ARCH)/Makefile.
1114-
OBJCOPYFLAGS_$@ may be used to set additional options.
1115-
1116-
gzip
1117-
Compress target. Use maximum compression to compress target.
1118-
11191111
Example:
11201112
#arch/x86/boot/Makefile
11211113
LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary
@@ -1139,6 +1131,19 @@ When kbuild executes, the following steps are followed (roughly):
11391131
resulting in the target file being recompiled for no
11401132
obvious reason.
11411133

1134+
objcopy
1135+
Copy binary. Uses OBJCOPYFLAGS usually specified in
1136+
arch/$(ARCH)/Makefile.
1137+
OBJCOPYFLAGS_$@ may be used to set additional options.
1138+
1139+
gzip
1140+
Compress target. Use maximum compression to compress target.
1141+
1142+
Example:
1143+
#arch/x86/boot/compressed/Makefile
1144+
$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
1145+
$(call if_changed,gzip)
1146+
11421147
dtc
11431148
Create flattened device tree blob object suitable for linking
11441149
into vmlinux. Device tree blobs linked into vmlinux are placed
@@ -1219,7 +1224,7 @@ When kbuild executes, the following steps are followed (roughly):
12191224
that may be shared between individual architectures.
12201225
The recommended approach how to use a generic header file is
12211226
to list the file in the Kbuild file.
1222-
See "7.3 generic-y" for further info on syntax etc.
1227+
See "7.2 generic-y" for further info on syntax etc.
12231228

12241229
--- 6.11 Post-link pass
12251230

@@ -1254,13 +1259,13 @@ A Kbuild file may be defined under arch/<arch>/include/uapi/asm/ and
12541259
arch/<arch>/include/asm/ to list asm files coming from asm-generic.
12551260
See subsequent chapter for the syntax of the Kbuild file.
12561261

1257-
--- 7.1 no-export-headers
1262+
--- 7.1 no-export-headers
12581263

12591264
no-export-headers is essentially used by include/uapi/linux/Kbuild to
12601265
avoid exporting specific headers (e.g. kvm.h) on architectures that do
12611266
not support it. It should be avoided as much as possible.
12621267

1263-
--- 7.2 generic-y
1268+
--- 7.2 generic-y
12641269

12651270
If an architecture uses a verbatim copy of a header from
12661271
include/asm-generic then this is listed in the file
@@ -1287,7 +1292,7 @@ See subsequent chapter for the syntax of the Kbuild file.
12871292
Example: termios.h
12881293
#include <asm-generic/termios.h>
12891294

1290-
--- 7.3 generated-y
1295+
--- 7.3 generated-y
12911296

12921297
If an architecture generates other header files alongside generic-y
12931298
wrappers, generated-y specifies them.
@@ -1299,7 +1304,7 @@ See subsequent chapter for the syntax of the Kbuild file.
12991304
#arch/x86/include/asm/Kbuild
13001305
generated-y += syscalls_32.h
13011306

1302-
--- 7.5 mandatory-y
1307+
--- 7.4 mandatory-y
13031308

13041309
mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm
13051310
to define the minimum set of headers that must be exported in

‎Documentation/networking/bonding.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2387,7 +2387,7 @@ broadcast: Like active-backup, there is not much advantage to this
23872387
and packet type ID), so in a "gatewayed" configuration, all
23882388
outgoing traffic will generally use the same device. Incoming
23892389
traffic may also end up on a single device, but that is
2390-
dependent upon the balancing policy of the peer's 8023.ad
2390+
dependent upon the balancing policy of the peer's 802.3ad
23912391
implementation. In a "local" configuration, traffic will be
23922392
distributed across the devices in the bond.
23932393

‎Documentation/process/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Below are the essential guides that every developer should read.
2525
submitting-patches
2626
coding-style
2727
email-clients
28+
kernel-enforcement-statement
2829

2930
Other guides to the community that are of interest to most developers are:
3031

‎Documentation/process/kernel-enforcement-statement.rst

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
Linux Kernel Enforcement Statement
2+
----------------------------------
3+
4+
As developers of the Linux kernel, we have a keen interest in how our software
5+
is used and how the license for our software is enforced. Compliance with the
6+
reciprocal sharing obligations of GPL-2.0 is critical to the long-term
7+
sustainability of our software and community.
8+
9+
Although there is a right to enforce the separate copyright interests in the
10+
contributions made to our community, we share an interest in ensuring that
11+
individual enforcement actions are conducted in a manner that benefits our
12+
community and do not have an unintended negative impact on the health and
13+
growth of our software ecosystem. In order to deter unhelpful enforcement
14+
actions, we agree that it is in the best interests of our development
15+
community to undertake the following commitment to users of the Linux kernel
16+
on behalf of ourselves and any successors to our copyright interests:
17+
18+
Notwithstanding the termination provisions of the GPL-2.0, we agree that
19+
it is in the best interests of our development community to adopt the
20+
following provisions of GPL-3.0 as additional permissions under our
21+
license with respect to any non-defensive assertion of rights under the
22+
license.
23+
24+
However, if you cease all violation of this License, then your license
25+
from a particular copyright holder is reinstated (a) provisionally,
26+
unless and until the copyright holder explicitly and finally
27+
terminates your license, and (b) permanently, if the copyright holder
28+
fails to notify you of the violation by some reasonable means prior to
29+
60 days after the cessation.
30+
31+
Moreover, your license from a particular copyright holder is
32+
reinstated permanently if the copyright holder notifies you of the
33+
violation by some reasonable means, this is the first time you have
34+
received notice of violation of this License (for any work) from that
35+
copyright holder, and you cure the violation prior to 30 days after
36+
your receipt of the notice.
37+
38+
Our intent in providing these assurances is to encourage more use of the
39+
software. We want companies and individuals to use, modify and distribute
40+
this software. We want to work with users in an open and transparent way to
41+
eliminate any uncertainty about our expectations regarding compliance or
42+
enforcement that might limit adoption of our software. We view legal action
43+
as a last resort, to be initiated only when other community efforts have
44+
failed to resolve the problem.
45+
46+
Finally, once a non-compliance issue is resolved, we hope the user will feel
47+
welcome to join us in our efforts on this project. Working together, we will
48+
be stronger.
49+
50+
Except where noted below, we speak only for ourselves, and not for any company
51+
we might work for today, have in the past, or will in the future.
52+
53+
- Bjorn Andersson (Linaro)
54+
- Andrea Arcangeli (Red Hat)
55+
- Neil Armstrong
56+
- Jens Axboe
57+
- Pablo Neira Ayuso
58+
- Khalid Aziz
59+
- Ralf Baechle
60+
- Felipe Balbi
61+
- Arnd Bergmann
62+
- Ard Biesheuvel
63+
- Paolo Bonzini (Red Hat)
64+
- Christian Borntraeger
65+
- Mark Brown (Linaro)
66+
- Paul Burton
67+
- Javier Martinez Canillas
68+
- Rob Clark
69+
- Jonathan Corbet
70+
- Vivien Didelot (Savoir-faire Linux)
71+
- Hans de Goede (Red Hat)
72+
- Mel Gorman (SUSE)
73+
- Sven Eckelmann
74+
- Alex Elder (Linaro)
75+
- Fabio Estevam
76+
- Larry Finger
77+
- Bhumika Goyal
78+
- Andy Gross
79+
- Juergen Gross
80+
- Shawn Guo
81+
- Ulf Hansson
82+
- Tejun Heo
83+
- Rob Herring
84+
- Masami Hiramatsu
85+
- Michal Hocko
86+
- Simon Horman
87+
- Johan Hovold (Hovold Consulting AB)
88+
- Christophe JAILLET
89+
- Olof Johansson
90+
- Lee Jones (Linaro)
91+
- Heiner Kallweit
92+
- Srinivas Kandagatla
93+
- Jan Kara
94+
- Shuah Khan (Samsung)
95+
- David Kershner
96+
- Jaegeuk Kim
97+
- Namhyung Kim
98+
- Colin Ian King
99+
- Jeff Kirsher
100+
- Greg Kroah-Hartman (Linux Foundation)
101+
- Christian König
102+
- Vinod Koul
103+
- Krzysztof Kozlowski
104+
- Viresh Kumar
105+
- Aneesh Kumar K.V
106+
- Julia Lawall
107+
- Doug Ledford (Red Hat)
108+
- Chuck Lever (Oracle)
109+
- Daniel Lezcano
110+
- Shaohua Li
111+
- Xin Long (Red Hat)
112+
- Tony Luck
113+
- Mike Marshall
114+
- Chris Mason
115+
- Paul E. McKenney
116+
- David S. Miller
117+
- Ingo Molnar
118+
- Kuninori Morimoto
119+
- Borislav Petkov
120+
- Jiri Pirko
121+
- Josh Poimboeuf
122+
- Sebastian Reichel (Collabora)
123+
- Guenter Roeck
124+
- Joerg Roedel
125+
- Leon Romanovsky
126+
- Steven Rostedt (VMware)
127+
- Ivan Safonov
128+
- Ivan Safonov
129+
- Anna Schumaker
130+
- Jes Sorensen
131+
- K.Y. Srinivasan
132+
- Heiko Stuebner
133+
- Jiri Kosina (SUSE)
134+
- Dmitry Torokhov
135+
- Linus Torvalds
136+
- Thierry Reding
137+
- Rik van Riel
138+
- Geert Uytterhoeven (Glider bvba)
139+
- Daniel Vetter
140+
- Linus Walleij
141+
- Richard Weinberger
142+
- Dan Williams
143+
- Rafael J. Wysocki
144+
- Arvind Yadav
145+
- Masahiro Yamada
146+
- Wei Yongjun
147+
- Lv Zheng

0 commit comments

Comments
 (0)