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

Commit bfa0399b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Alistair Delva
Browse files

Merge Linus's 5.4-rc1-prerelease branch into android-mainline 

This merges Linus's tree as of commit b41dae06 ("Merge tag
'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux"

)
into android-mainline.

This "early" merge makes it easier to test and handle merge conflicts
instead of having to wait until the "end" of the merge window and handle
all 10000+ commits at once.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I6bebf55e5e2353f814e3c87f5033607b1ae5d812
parents cae5e996 b41dae06

.mailmap

+16 −5
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com> 
Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>

Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>

Chao Yu <chao@kernel.org> <yuchao0@huawei.com>

Christoph Hellwig <hch@lst.de>

Christophe Ricard <christophe.ricard@gmail.com>

Corey Minyard <minyard@acm.org>
@@ -63,6 +65,7 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com> 
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dczhu@mips.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>

<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>

Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>

Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
@@ -80,6 +83,8 @@ Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com> 
Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>

Frank Zago <fzago@systemfabricworks.com>

Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>

Greg Kroah-Hartman <greg@echidna.(none)>

Greg Kroah-Hartman <gregkh@suse.de>

Greg Kroah-Hartman <greg@kroah.com>
@@ -90,6 +95,9 @@ Henrik Kretzschmar <henne@nachtwindheim.de> 
Henrik Rydberg <rydberg@bitmath.org>

Herbert Xu <herbert@gondor.apana.org.au>

Jacob Shin <Jacob.Shin@amd.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>

James Bottomley <jejb@mulgrave.(none)>

James Bottomley <jejb@titanic.il.steeleye.com>

James E Wilson <wilson@specifix.com>
@@ -178,8 +186,14 @@ Morten Welinder <welinder@darter.rentec.com> 
Morten Welinder <welinder@troll.com>

Mythri P K <mythripk@ti.com>

Nguyen Anh Quynh <aquynh@gmail.com>

Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>

Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>

Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>

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>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Patrick Mochel <mochel@digitalimplant.org>

Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
@@ -190,11 +204,7 @@ 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>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rajesh Shah <rajesh.shah@intel.com>

Ralf Baechle <ralf@linux-mips.org>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -229,6 +239,7 @@ Sumit Semwal <sumit.semwal@ti.com> 
Tejun Heo <htejun@gmail.com>

Thomas Graf <tgraf@suug.ch>

Thomas Pedersen <twp@codeaurora.org>

Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>

Tony Luck <tony.luck@intel.com>

TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

CREDITS

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ S: Santa Cruz, California 
S: USA



N: Luis Correia

E: lfcorreia@users.sf.net

E: luisfcorreia@gmail.com

D: Ralink rt2x00 WLAN driver

S: Belas, Portugal

Documentation/ABI/stable/sysfs-bus-w1

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ Description: Bus scanning interval, microseconds component. 
		control systems are attached/generate presence for as short as

		100 ms - hence the tens-to-hundreds milliseconds scan intervals

		are required.

		see Documentation/w1/w1.generic for detailed information.

		see Documentation/w1/w1-generic.rst for detailed information.

Users:		any user space application which wants to know bus scanning

		interval

Documentation/ABI/stable/sysfs-driver-w1_ds28e04

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ What: /sys/bus/w1/devices/.../pio 
Date:		May 2012

Contact:	Markus Franke <franm@hrz.tu-chemnitz.de>

Description:	read/write the contents of the two PIO's of the DS28E04-100

		see Documentation/w1/slaves/w1_ds28e04 for detailed information

		see Documentation/w1/slaves/w1_ds28e04.rst for detailed information

Users:		any user space application which wants to communicate with DS28E04-100
@@ -11,5 +11,5 @@ What: /sys/bus/w1/devices/.../eeprom 
Date:		May 2012

Contact:	Markus Franke <franm@hrz.tu-chemnitz.de>

Description:	read/write the contents of the EEPROM memory of the DS28E04-100

		see Documentation/w1/slaves/w1_ds28e04 for detailed information

		see Documentation/w1/slaves/w1_ds28e04.rst for detailed information

Users:		any user space application which wants to communicate with DS28E04-100

Documentation/ABI/stable/sysfs-driver-w1_ds28ea00

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ What: /sys/bus/w1/devices/.../w1_seq 
Date:		Apr 2015

Contact:	Matt Campbell <mattrcampbell@gmail.com>

Description:	Support for the DS28EA00 chain sequence function

		see Documentation/w1/slaves/w1_therm for detailed information

		see Documentation/w1/slaves/w1_therm.rst for detailed information

Users:		any user space application which wants to communicate with DS28EA00