Skip to content

Commit 141d3b1

Browse files
author
Ingo Molnar
committed
Merge branch 'linus' into x86/apic, to resolve conflicts
Conflicts: arch/x86/include/asm/x2apic.h Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents c201c91 + e4880bc commit 141d3b1

File tree

13,358 files changed

+21189
-4964
lines changed

Some content is hidden

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

13,358 files changed

+21189
-4964
lines changed

‎.mailmap

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
1515
Alan Cox <alan@lxorguk.ukuu.org.uk>
1616
Alan Cox <root@hraefn.swansea.linux.org.uk>
1717
Aleksey Gorelov <aleksey_gorelov@phoenix.com>
18+
Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
1819
Al Viro <viro@ftp.linux.org.uk>
1920
Al Viro <viro@zenIV.linux.org.uk>
2021
Andreas Herrmann <aherrman@de.ibm.com>
@@ -43,6 +44,7 @@ Corey Minyard <minyard@acm.org>
4344
Damian Hobson-Garcia <dhobsong@igel.co.jp>
4445
David Brownell <david-b@pacbell.net>
4546
David Woodhouse <dwmw2@shinybook.infradead.org>
47+
Deng-Cheng Zhu <dengcheng.zhu@mips.com> <dengcheng.zhu@imgtec.com>
4648
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
4749
Domen Puncer <domen@coderock.org>
4850
Douglas Gilbert <dougg@torque.net>
@@ -100,6 +102,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
100102
Linas Vepstas <linas@austin.ibm.com>
101103
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
102104
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
105+
Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
103106
Mark Brown <broonie@sirena.org.uk>
104107
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
105108
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
@@ -114,9 +117,11 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
114117
Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
115118
Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
116119
Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
120+
Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
117121
Mayuresh Janorkar <mayur@ti.com>
118122
Michael Buesch <m@bues.ch>
119123
Michel Dänzer <michel@tungstengraphics.com>
124+
Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
120125
Mitesh shah <mshah@teja.com>
121126
Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
122127
Morten Welinder <terra@gnome.org>
@@ -127,6 +132,7 @@ Mythri P K <mythripk@ti.com>
127132
Nguyen Anh Quynh <aquynh@gmail.com>
128133
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
129134
Patrick Mochel <mochel@digitalimplant.org>
135+
Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
130136
Peter A Jonsson <pj@ludd.ltu.se>
131137
Peter Oruba <peter@oruba.de>
132138
Peter Oruba <peter.oruba@amd.com>

‎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-class-remoteproc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /sys/class/remoteproc/.../firmware
22
Date: October 2016
3-
Contact: Matt Redfearn <matt.redfearn@imgtec.com>
3+
Contact: Matt Redfearn <matt.redfearn@mips.com>
44
Description: Remote processor firmware
55

66
Reports the name of the firmware currently loaded to the
@@ -11,7 +11,7 @@ Description: Remote processor firmware
1111

1212
What: /sys/class/remoteproc/.../state
1313
Date: October 2016
14-
Contact: Matt Redfearn <matt.redfearn@imgtec.com>
14+
Contact: Matt Redfearn <matt.redfearn@mips.com>
1515
Description: Remote processor state
1616

1717
Reports the state of the remote processor, which will be one of:

‎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

0 commit comments

Comments
 (0)