Skip to content

Commit 9babb09

Browse files
author
Ingo Molnar
committed
Merge tag 'v4.14-rc6' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 5cdda51 + bb176f6 commit 9babb09

File tree

479 files changed

+5183
-2345
lines changed

Some content is hidden

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

479 files changed

+5183
-2345
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-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/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

‎MAINTAINERS

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5346,9 +5346,7 @@ M: "J. Bruce Fields" <bfields@fieldses.org>
53465346
L: linux-fsdevel@vger.kernel.org
53475347
S: Maintained
53485348
F: include/linux/fcntl.h
5349-
F: include/linux/fs.h
53505349
F: include/uapi/linux/fcntl.h
5351-
F: include/uapi/linux/fs.h
53525350
F: fs/fcntl.c
53535351
F: fs/locks.c
53545352

@@ -5357,6 +5355,8 @@ M: Alexander Viro <viro@zeniv.linux.org.uk>
53575355
L: linux-fsdevel@vger.kernel.org
53585356
S: Maintained
53595357
F: fs/*
5358+
F: include/linux/fs.h
5359+
F: include/uapi/linux/fs.h
53605360

53615361
FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
53625362
M: Riku Voipio <riku.voipio@iki.fi>
@@ -7571,7 +7571,7 @@ F: arch/mips/include/asm/kvm*
75717571
F: arch/mips/kvm/
75727572

75737573
KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)
7574-
M: Alexander Graf <agraf@suse.com>
7574+
M: Paul Mackerras <paulus@ozlabs.org>
75757575
L: kvm-ppc@vger.kernel.org
75767576
W: http://www.linux-kvm.org/
75777577
T: git git://github.com/agraf/linux-2.6.git
@@ -9213,7 +9213,6 @@ F: include/linux/isicom.h
92139213
MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
92149214
M: Bin Liu <b-liu@ti.com>
92159215
L: linux-usb@vger.kernel.org
9216-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
92179216
S: Maintained
92189217
F: drivers/usb/musb/
92199218

@@ -10560,6 +10559,8 @@ M: Peter Zijlstra <peterz@infradead.org>
1056010559
M: Ingo Molnar <mingo@redhat.com>
1056110560
M: Arnaldo Carvalho de Melo <acme@kernel.org>
1056210561
R: Alexander Shishkin <alexander.shishkin@linux.intel.com>
10562+
R: Jiri Olsa <jolsa@redhat.com>
10563+
R: Namhyung Kim <namhyung@kernel.org>
1056310564
L: linux-kernel@vger.kernel.org
1056410565
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
1056510566
S: Supported

‎Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 4
22
PATCHLEVEL = 14
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc4
4+
EXTRAVERSION = -rc6
55
NAME = Fearless Coyote
66

77
# *DOCUMENTATION*
@@ -933,7 +933,11 @@ ifdef CONFIG_STACK_VALIDATION
933933
ifeq ($(has_libelf),1)
934934
objtool_target := tools/objtool FORCE
935935
else
936-
$(warning "Cannot use CONFIG_STACK_VALIDATION, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
936+
ifdef CONFIG_ORC_UNWINDER
937+
$(error "Cannot generate ORC metadata for CONFIG_ORC_UNWINDER=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
938+
else
939+
$(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
940+
endif
937941
SKIP_STACK_VALIDATION := 1
938942
export SKIP_STACK_VALIDATION
939943
endif

‎arch/arm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ endif
131131
KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
132132
KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float
133133

134-
CHECKFLAGS += -D__arm__
134+
CHECKFLAGS += -D__arm__ -m32
135135

136136
#Default value
137137
head-y := arch/arm/kernel/head$(MMUEXT).o

‎arch/arm/boot/compressed/debug.S

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ ENTRY(putc)
2323
strb r0, [r1]
2424
mov r0, #0x03 @ SYS_WRITEC
2525
ARM( svc #0x123456 )
26+
#ifdef CONFIG_CPU_V7M
27+
THUMB( bkpt #0xab )
28+
#else
2629
THUMB( svc #0xab )
30+
#endif
2731
mov pc, lr
2832
.align 2
2933
1: .word _GLOBAL_OFFSET_TABLE_ - .

‎arch/arm/boot/dts/armada-38x.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
};
179179

180180
i2c0: i2c@11000 {
181-
compatible = "marvell,mv64xxx-i2c";
181+
compatible = "marvell,mv78230-a0-i2c", "marvell,mv64xxx-i2c";
182182
reg = <0x11000 0x20>;
183183
#address-cells = <1>;
184184
#size-cells = <0>;
@@ -189,7 +189,7 @@
189189
};
190190

191191
i2c1: i2c@11100 {
192-
compatible = "marvell,mv64xxx-i2c";
192+
compatible = "marvell,mv78230-a0-i2c", "marvell,mv64xxx-i2c";
193193
reg = <0x11100 0x20>;
194194
#address-cells = <1>;
195195
#size-cells = <0>;

‎arch/arm/boot/dts/at91-sama5d27_som1.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
pinctrl-0 = <&pinctrl_macb0_default>;
6868
phy-mode = "rmii";
6969

70-
ethernet-phy@1 {
71-
reg = <0x1>;
70+
ethernet-phy@0 {
71+
reg = <0x0>;
7272
interrupt-parent = <&pioA>;
7373
interrupts = <PIN_PD31 IRQ_TYPE_LEVEL_LOW>;
7474
pinctrl-names = "default";

0 commit comments

Comments
 (0)