Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f675231 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v4.20-rc5' into sched/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 3e184501 25956467

.clang-format

+0 −1
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ ForEachMacros: 
  - 'protocol_for_each_card'

  - 'protocol_for_each_dev'

  - 'queue_for_each_hw_ctx'

  - 'radix_tree_for_each_contig'

  - 'radix_tree_for_each_slot'

  - 'radix_tree_for_each_tagged'

  - 'rbtree_postorder_for_each_entry_safe'

.mailmap

+13 −0
Original line number Diff line number Diff line
@@ -119,6 +119,13 @@ Mark Brown <broonie@sirena.org.uk> 
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>

Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>

Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>

Matthew Wilcox <willy@infradead.org> <mawilcox@linuxonhyperv.com>

Matthew Wilcox <willy@infradead.org> <mawilcox@microsoft.com>

Matthew Wilcox <willy@infradead.org> <willy@debian.org>

Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>

Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>

Matthieu CASTET <castet.matthieu@free.fr>

Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>

Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
@@ -152,7 +159,13 @@ Peter Oruba <peter@oruba.de> 
Peter Oruba <peter.oruba@amd.com>

Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>

Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>

Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>

Rajesh Shah <rajesh.shah@intel.com>

Ralf Baechle <ralf@linux-mips.org>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -2138,6 +2138,10 @@ E: paul@laufernet.com 
D: Soundblaster driver fixes, ISAPnP quirk

S: California, USA



N: Jarkko Lavinen

E: jarkko.lavinen@nokia.com

D: OMAP MMC support



N: Jonathan Layes

D: ARPD support
@@ -2200,6 +2204,10 @@ S: Post Office Box 371 
S: North Little Rock, Arkansas 72115

S: USA



N: Christopher Li

E: sparse@chrisli.org

D: Sparse maintainer 2009 - 2018



N: Stephan Linz

E: linz@mazet.de

E: Stephan.Linz@gmx.de

Documentation/ABI/testing/sysfs-bus-iio

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ Description: 


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

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

KernelVersion:	4.18

KernelVersion:	4.19

Contact:	linux-iio@vger.kernel.org

Description:

		Relative position in direction x or y on a pad (may be

Documentation/ABI/testing/sysfs-class-led-trigger-pattern

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ Description: 
		  0-|   /             \/             \/

		    +---0----1----2----3----4----5----6------------> time (s)



		2. To make the LED go instantly from one brigntess value to another,

		we should use use zero-time lengths (the brightness must be same as

		2. To make the LED go instantly from one brightness value to another,

		we should use zero-time lengths (the brightness must be same as

		the previous tuple's). So the format should be:

		"brightness_1 duration_1 brightness_1 0 brightness_2 duration_2

		brightness_2 0 ...". For example: