Commit 0698461a authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core 



To update the perf/core codebase.

Fix conflict by moving arch__post_evsel_config(evsel, attr) to the end
of evsel__config(), after what was added in:

  49c692b7 ("perf offcpu: Accept allowed sample types only")

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 0d2997f7 ff699273

.mailmap

+7 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
# Please keep this list dictionary sorted.

#

Aaron Durbin <adurbin@google.com>

Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>

Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>

Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>

Adam Oldham <oldhamca@gmail.com>

Adam Radford <aradford@gmail.com>
@@ -62,6 +64,9 @@ Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com> 
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>

Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>

Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>
@@ -85,6 +90,7 @@ Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com> 
Christian Brauner <brauner@kernel.org> <christian@brauner.io>

Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>

Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>

Christian Marangi <ansuelsmth@gmail.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
@@ -165,6 +171,7 @@ Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com> 
Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>

Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -627,6 +627,10 @@ S: 48287 Sawleaf 
S: Fremont, California 94539

S: USA



N: Tomas Cech

E: sleep_walker@suse.com

D: arm/palm treo support



N: Florent Chabaud

E: florent.chabaud@polytechnique.org

D: software suspend

Documentation/ABI/testing/sysfs-bus-iio-vf610

+1 −1
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/conversion_mode

What:		/sys/bus/iio/devices/iio:deviceX/in_conversion_mode

KernelVersion:	4.2

Contact:	linux-iio@vger.kernel.org

Description:

Documentation/admin-guide/kernel-parameters.txt

+25 −0
Original line number Diff line number Diff line
@@ -5197,6 +5197,30 @@ 


	retain_initrd	[RAM] Keep initrd memory after extraction



	retbleed=	[X86] Control mitigation of RETBleed (Arbitrary

			Speculative Code Execution with Return Instructions)

			vulnerability.



			off          - no mitigation

			auto         - automatically select a migitation

			auto,nosmt   - automatically select a mitigation,

				       disabling SMT if necessary for

				       the full mitigation (only on Zen1

				       and older without STIBP).

			ibpb	     - mitigate short speculation windows on

				       basic block boundaries too. Safe, highest

				       perf impact.

			unret        - force enable untrained return thunks,

				       only effective on AMD f15h-f17h

				       based systems.

			unret,nosmt  - like unret, will disable SMT when STIBP

			               is not available.



			Selecting 'auto' will choose a mitigation method at run

			time according to the CPU.



			Not specifying this option is equivalent to retbleed=auto.



	rfkill.default_state=

		0	"airplane mode".  All wifi, bluetooth, wimax, gps, fm,

			etc. communication is blocked by default.
@@ -5568,6 +5592,7 @@ 
			eibrs		  - enhanced IBRS

			eibrs,retpoline   - enhanced IBRS + Retpolines

			eibrs,lfence      - enhanced IBRS + LFENCE

			ibrs		  - use IBRS to protect kernel



			Not specifying this option is equivalent to

			spectre_v2=auto.

Documentation/core-api/kernel-api.rst

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ Module Loading 
Inter Module support

--------------------



Refer to the file kernel/module.c for more information.

Refer to the files in kernel/module/ for more information.



Hardware Interfaces

===================