Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (4dc6758d) · Commits · e / devices / android_kernel_fairphone_FP4

.mailmap

+3 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
		Alan Cox <alan@lxorguk.ukuu.org.uk>
		Alan Cox <root@hraefn.swansea.linux.org.uk>
		Aleksey Gorelov <aleksey_gorelov@phoenix.com>
		Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
		Al Viro <viro@ftp.linux.org.uk>
		Al Viro <viro@zenIV.linux.org.uk>
		Andreas Herrmann <aherrman@de.ibm.com>
		@@ -101,6 +102,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
		Linas Vepstas <linas@austin.ibm.com>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
		Mark Brown <broonie@sirena.org.uk>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
		@@ -119,6 +121,7 @@ Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
		Mayuresh Janorkar <mayur@ti.com>
		Michael Buesch <m@bues.ch>
		Michel Dänzer <michel@tungstengraphics.com>
		Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
		Mitesh shah <mshah@teja.com>
		Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
		Morten Welinder <terra@gnome.org>

Documentation/process/kernel-enforcement-statement.rst

+16 −6

Original line number	Diff line number	Diff line
		@@ -50,8 +50,9 @@ be stronger.
		Except where noted below, we speak only for ourselves, and not for any company
		we might work for today, have in the past, or will in the future.

		- Laura Abbott
		- Bjorn Andersson (Linaro)
		- Andrea Arcangeli (Red Hat)
		- Andrea Arcangeli
		- Neil Armstrong
		- Jens Axboe
		- Pablo Neira Ayuso
		@@ -60,15 +61,17 @@ we might work for today, have in the past, or will in the future.
		- Felipe Balbi
		- Arnd Bergmann
		- Ard Biesheuvel
		- Paolo Bonzini (Red Hat)
		- Tim Bird
		- Paolo Bonzini
		- Christian Borntraeger
		- Mark Brown (Linaro)
		- Paul Burton
		- Javier Martinez Canillas
		- Rob Clark
		- Jonathan Corbet
		- Dennis Dalessandro
		- Vivien Didelot (Savoir-faire Linux)
		- Hans de Goede (Red Hat)
		- Hans de Goede
		- Mel Gorman (SUSE)
		- Sven Eckelmann
		- Alex Elder (Linaro)
		@@ -79,6 +82,7 @@ we might work for today, have in the past, or will in the future.
		- Juergen Gross
		- Shawn Guo
		- Ulf Hansson
		- Stephen Hemminger (Microsoft)
		- Tejun Heo
		- Rob Herring
		- Masami Hiramatsu
		@@ -104,18 +108,21 @@ we might work for today, have in the past, or will in the future.
		- Viresh Kumar
		- Aneesh Kumar K.V
		- Julia Lawall
		- Doug Ledford (Red Hat)
		- Doug Ledford
		- Chuck Lever (Oracle)
		- Daniel Lezcano
		- Shaohua Li
		- Xin Long (Red Hat)
		- Xin Long
		- Tony Luck
		- Catalin Marinas (Arm Ltd)
		- Mike Marshall
		- Chris Mason
		- Paul E. McKenney
		- David S. Miller
		- Ingo Molnar
		- Kuninori Morimoto
		- Trond Myklebust
		- Martin K. Petersen (Oracle)
		- Borislav Petkov
		- Jiri Pirko
		- Josh Poimboeuf
		@@ -124,18 +131,20 @@ we might work for today, have in the past, or will in the future.
		- Joerg Roedel
		- Leon Romanovsky
		- Steven Rostedt (VMware)
		- Ivan Safonov
		- Frank Rowand
		- Ivan Safonov
		- Anna Schumaker
		- Jes Sorensen
		- K.Y. Srinivasan
		- Heiko Stuebner
		- Jiri Kosina (SUSE)
		- Willy Tarreau
		- Dmitry Torokhov
		- Linus Torvalds
		- Thierry Reding
		- Rik van Riel
		- Geert Uytterhoeven (Glider bvba)
		- Eduardo Valentin (Amazon.com)
		- Daniel Vetter
		- Linus Walleij
		- Richard Weinberger
		@@ -145,3 +154,4 @@ we might work for today, have in the past, or will in the future.
		- Masahiro Yamada
		- Wei Yongjun
		- Lv Zheng
		- Marc Zyngier (Arm Ltd)

MAINTAINERS

+9 −5

Original line number	Diff line number	Diff line
		@@ -873,7 +873,7 @@ F: drivers/android/
		F: drivers/staging/android/

		ANDROID GOLDFISH RTC DRIVER
		M: Miodrag Dinic <miodrag.dinic@imgtec.com>
		M: Miodrag Dinic <miodrag.dinic@mips.com>
		S: Supported
		F: Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt
		F: drivers/rtc/rtc-goldfish.c
		@@ -7752,6 +7752,11 @@ S: Maintained
		F: Documentation/scsi/53c700.txt
		F: drivers/scsi/53c700*

		LEAKING_ADDRESSES
		M: Tobin C. Harding <me@tobin.cc>
		S: Maintained
		F: scripts/leaking_addresses.pl

		LED SUBSYSTEM
		M: Richard Purdie <rpurdie@rpsys.net>
		M: Jacek Anaszewski <jacek.anaszewski@gmail.com>
		@@ -9027,7 +9032,7 @@ F: drivers//loongson1*
		F: drivers///loongson1

		MIPS RINT INSTRUCTION EMULATION
		M: Aleksandar Markovic <aleksandar.markovic@imgtec.com>
		M: Aleksandar Markovic <aleksandar.markovic@mips.com>
		L: linux-mips@linux-mips.org
		S: Supported
		F: arch/mips/math-emu/sp_rint.c
		@@ -10692,10 +10697,9 @@ S: Maintained
		F: drivers/pinctrl/spear/

		PISTACHIO SOC SUPPORT
		M: James Hartley <james.hartley@imgtec.com>
		M: Ionela Voinescu <ionela.voinescu@imgtec.com>
		M: James Hartley <james.hartley@sondrel.com>
		L: linux-mips@linux-mips.org
		S: Maintained
		S: Odd Fixes
		F: arch/mips/pistachio/
		F: arch/mips/include/asm/mach-pistachio/
		F: arch/mips/boot/dts/img/pistachio*

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		VERSION = 4
		PATCHLEVEL = 14
		SUBLEVEL = 0
		EXTRAVERSION = -rc7
		EXTRAVERSION = -rc8
		NAME = Fearless Coyote

		# DOCUMENTATION

arch/arm/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -44,10 +44,12 @@ endif

		ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)
		KBUILD_CPPFLAGS += -mbig-endian
		CHECKFLAGS += -D__ARMEB__
		AS += -EB
		LD += -EB
		else
		KBUILD_CPPFLAGS += -mlittle-endian
		CHECKFLAGS += -D__ARMEL__
		AS += -EL
		LD += -EL
		endif