Skip to content

Commit

Permalink
Merge branch 'linus' into x86/apic, to resolve conflicts
Browse files Browse the repository at this point in the history 
Conflicts:
	arch/x86/include/asm/x2apic.h

Signed-off-by: Ingo Molnar <[email protected]>
  • Loading branch information
Ingo Molnar committed Nov 7, 2017
2 parents c201c91 + e4880bc commit 141d3b1
Show file tree
Hide file tree
Showing 13,358 changed files with 21,189 additions and 4,964 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 6 additions & 0 deletions .mailmap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Adriana Reus <[email protected]> <[email protected]>
Alan Cox <[email protected]>
Alan Cox <[email protected]>
Aleksey Gorelov <[email protected]>
Aleksandar Markovic <[email protected]> <[email protected]>
Al Viro <[email protected]>
Al Viro <[email protected]>
Andreas Herrmann <[email protected]>
Expand Down Expand Up @@ -43,6 +44,7 @@ Corey Minyard <[email protected]>
Damian Hobson-Garcia <[email protected]>
David Brownell <[email protected]>
David Woodhouse <[email protected]>
Deng-Cheng Zhu <[email protected]> <[email protected]>
Dmitry Eremin-Solenikov <[email protected]>
Domen Puncer <[email protected]>
Douglas Gilbert <[email protected]>
Expand Down Expand Up @@ -100,6 +102,7 @@ Leonid I Ananiev <[email protected]>
Linas Vepstas <[email protected]>
Linus Lüssing <[email protected]> <[email protected]>
Linus Lüssing <[email protected]> <[email protected]>
Marcin Nowakowski <[email protected]> <[email protected]>
Mark Brown <[email protected]>
Martin Kepplinger <[email protected]> <[email protected]>
Martin Kepplinger <[email protected]> <[email protected]>
Expand All @@ -114,9 +117,11 @@ Mauro Carvalho Chehab <[email protected]> <[email protected]>
Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]>
Matt Ranostay <[email protected]> <[email protected]>
Matt Ranostay <[email protected]> <[email protected]>
Matt Redfearn <[email protected]> <[email protected]>
Mayuresh Janorkar <[email protected]>
Michael Buesch <[email protected]>
Michel Dänzer <[email protected]>
Miodrag Dinic <[email protected]> <[email protected]>
Mitesh shah <[email protected]>
Mohit Kumar <[email protected]> <[email protected]>
Morten Welinder <[email protected]>
Expand All @@ -127,6 +132,7 @@ Mythri P K <[email protected]>
Nguyen Anh Quynh <[email protected]>
Paolo 'Blaisorblade' Giarrusso <[email protected]>
Patrick Mochel <[email protected]>
Paul Burton <[email protected]> <[email protected]>
Peter A Jonsson <[email protected]>
Peter Oruba <[email protected]>
Peter Oruba <[email protected]>
Expand Down
8 changes: 8 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,11 @@ Description:
Show or set the gain boost of the amp, from 0-31 range.
18 = indoors (default)
14 = outdoors

What /sys/bus/iio/devices/iio:deviceX/noise_level_tripped
Date: May 2017
KernelVersion: 4.13
Contact: Matt Ranostay <[email protected]>
Description:
When 1 the noise level is over the trip level and not reporting
valid data
4 changes: 2 additions & 2 deletions Documentation/ABI/testing/sysfs-class-remoteproc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
What: /sys/class/remoteproc/.../firmware
Date: October 2016
Contact: Matt Redfearn <matt.redfearn@imgtec.com>
Contact: Matt Redfearn <matt.redfearn@mips.com>
Description: Remote processor firmware

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

What: /sys/class/remoteproc/.../state
Date: October 2016
Contact: Matt Redfearn <matt.redfearn@imgtec.com>
Contact: Matt Redfearn <matt.redfearn@mips.com>
Description: Remote processor state

Reports the state of the remote processor, which will be one of:
Expand Down
10 changes: 0 additions & 10 deletions Documentation/ABI/testing/sysfs-kernel-mm-swap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,3 @@ Description: Enable/disable VMA based swap readahead.
still used for tmpfs etc. other users. If set to
false, the global swap readahead algorithm will be
used for all swappable pages.

What: /sys/kernel/mm/swap/vma_ra_max_order
Date: August 2017
Contact: Linux memory management mailing list <[email protected]>
Description: The max readahead size in order for VMA based swap readahead

VMA based swap readahead algorithm will readahead at
most 1 << max_order pages for each readahead. The
real readahead size for each readahead will be scaled
according to the estimation algorithm.
14 changes: 0 additions & 14 deletions Documentation/core-api/kernel-api.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,44 +352,30 @@ Read-Copy Update (RCU)
----------------------

.. kernel-doc:: include/linux/rcupdate.h
:external:

.. kernel-doc:: include/linux/rcupdate_wait.h
:external:

.. kernel-doc:: include/linux/rcutree.h
:external:

.. kernel-doc:: kernel/rcu/tree.c
:external:

.. kernel-doc:: kernel/rcu/tree_plugin.h
:external:

.. kernel-doc:: kernel/rcu/tree_exp.h
:external:

.. kernel-doc:: kernel/rcu/update.c
:external:

.. kernel-doc:: include/linux/srcu.h
:external:

.. kernel-doc:: kernel/rcu/srcutree.c
:external:

.. kernel-doc:: include/linux/rculist_bl.h
:external:

.. kernel-doc:: include/linux/rculist.h
:external:

.. kernel-doc:: include/linux/rculist_nulls.h
:external:

.. kernel-doc:: include/linux/rcu_sync.h
:external:

.. kernel-doc:: kernel/rcu/sync.c
:external:

5 changes: 5 additions & 0 deletions Documentation/devicetree/bindings/iio/proximity/as3935.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ Optional properties:
- ams,tuning-capacitor-pf: Calibration tuning capacitor stepping
value 0 - 120pF. This will require using the calibration data from
the manufacturer.
- ams,nflwdth: Set the noise and watchdog threshold register on
startup. This will need to set according to the noise from the
MCU board, and possibly the local environment. Refer to the
datasheet for the threshold settings.

Example:

Expand All @@ -27,4 +31,5 @@ as3935@0 {
interrupt-parent = <&gpio1>;
interrupts = <16 1>;
ams,tuning-capacitor-pf = <80>;
ams,nflwdth = <0x44>;
};
6 changes: 3 additions & 3 deletions Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Examples:
compatible = "arm,gic-v3-its";
msi-controller;
#msi-cells = <1>;
reg = <0x0 0x2c200000 0 0x200000>;
reg = <0x0 0x2c200000 0 0x20000>;
};
};

Expand All @@ -124,14 +124,14 @@ Examples:
compatible = "arm,gic-v3-its";
msi-controller;
#msi-cells = <1>;
reg = <0x0 0x2c200000 0 0x200000>;
reg = <0x0 0x2c200000 0 0x20000>;
};

gic-its@2c400000 {
compatible = "arm,gic-v3-its";
msi-controller;
#msi-cells = <1>;
reg = <0x0 0x2c400000 0 0x200000>;
reg = <0x0 0x2c400000 0 0x20000>;
};

ppi-partitions {
Expand Down
31 changes: 18 additions & 13 deletions Documentation/kbuild/makefiles.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1108,14 +1108,6 @@ When kbuild executes, the following steps are followed (roughly):
ld
Link target. Often, LDFLAGS_$@ is used to set specific options to ld.

objcopy
Copy binary. Uses OBJCOPYFLAGS usually specified in
arch/$(ARCH)/Makefile.
OBJCOPYFLAGS_$@ may be used to set additional options.

gzip
Compress target. Use maximum compression to compress target.

Example:
#arch/x86/boot/Makefile
LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary
Expand All @@ -1139,6 +1131,19 @@ When kbuild executes, the following steps are followed (roughly):
resulting in the target file being recompiled for no
obvious reason.

objcopy
Copy binary. Uses OBJCOPYFLAGS usually specified in
arch/$(ARCH)/Makefile.
OBJCOPYFLAGS_$@ may be used to set additional options.

gzip
Compress target. Use maximum compression to compress target.

Example:
#arch/x86/boot/compressed/Makefile
$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
$(call if_changed,gzip)

dtc
Create flattened device tree blob object suitable for linking
into vmlinux. Device tree blobs linked into vmlinux are placed
Expand Down Expand Up @@ -1219,7 +1224,7 @@ When kbuild executes, the following steps are followed (roughly):
that may be shared between individual architectures.
The recommended approach how to use a generic header file is
to list the file in the Kbuild file.
See "7.3 generic-y" for further info on syntax etc.
See "7.2 generic-y" for further info on syntax etc.

--- 6.11 Post-link pass

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

--- 7.1 no-export-headers
--- 7.1 no-export-headers

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

--- 7.2 generic-y
--- 7.2 generic-y

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

--- 7.3 generated-y
--- 7.3 generated-y

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

--- 7.5 mandatory-y
--- 7.4 mandatory-y

mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm
to define the minimum set of headers that must be exported in
Expand Down
2 changes: 1 addition & 1 deletion Documentation/networking/bonding.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2387,7 +2387,7 @@ broadcast: Like active-backup, there is not much advantage to this
and packet type ID), so in a "gatewayed" configuration, all
outgoing traffic will generally use the same device. Incoming
traffic may also end up on a single device, but that is
dependent upon the balancing policy of the peer's 8023.ad
dependent upon the balancing policy of the peer's 802.3ad
implementation. In a "local" configuration, traffic will be
distributed across the devices in the bond.

Expand Down
1 change: 1 addition & 0 deletions Documentation/process/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Below are the essential guides that every developer should read.
submitting-patches
coding-style
email-clients
kernel-enforcement-statement

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

Expand Down
Loading

0 comments on commit 141d3b1

Please sign in to comment.