Commit 761bfc33 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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



To pick up BPF fixes to allow a clean 'make -C tools/perf build-test':

  7c3977d1 libbpf: Fix sym->st_value print on 32-bit arches
  1fd450f9 libbpf: Fix up generation of bpf_helper_defs.h

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 0f60a0bc 6794862a

.gitattributes

+2 −0
Original line number Diff line number Diff line 
*.c   diff=cpp

*.h   diff=cpp

*.dtsi diff=dts

*.dts  diff=dts

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
*.lzo

*.mod

*.mod.c

*.ns_deps

*.o

*.o.*

*.patch
@@ -61,6 +60,7 @@ modules.order 
/System.map

/Module.markers

/modules.builtin.modinfo

/modules.nsdeps



#

# RPM spec file (make rpm-pkg)

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -105,6 +105,9 @@ James E Wilson <wilson@specifix.com> 
James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

James Hogan <jhogan@kernel.org> <james@albanarts.com>

James Ketrenos <jketreno@io.(none)>

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>

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

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

Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
@@ -156,6 +159,7 @@ 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>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>

Mathieu Othacehe <m.othacehe@gmail.com>

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

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

CREDITS

+2 −1
Original line number Diff line number Diff line
@@ -1875,8 +1875,9 @@ S: The Netherlands 


N: Martin Kepplinger

E: martink@posteo.de

E: martin.kepplinger@ginzinger.com

E: martin.kepplinger@puri.sm

W: http://www.martinkepplinger.com

P: 4096R/5AB387D3 F208 2B88 0F9E 4239 3468  6E3F 5003 98DF 5AB3 87D3

D: mma8452 accelerators iio driver

D: pegasus_notetaker input driver

D: Kernel fixes and cleanups

Documentation/ABI/stable/sysfs-driver-aspeed-vuart

+10 −1
Original line number Diff line number Diff line
@@ -6,10 +6,19 @@ Description: Configures which IO port the host side of the UART 
Users:		OpenBMC.  Proposed changes should be mailed to

		openbmc@lists.ozlabs.org



What:		/sys/bus/platform/drivers/aspeed-vuart*/sirq

What:		/sys/bus/platform/drivers/aspeed-vuart/*/sirq

Date:		April 2017

Contact:	Jeremy Kerr <jk@ozlabs.org>

Description:	Configures which interrupt number the host side of

		the UART will appear on the host <-> BMC LPC bus.

Users:		OpenBMC.  Proposed changes should be mailed to

		openbmc@lists.ozlabs.org



What:		/sys/bus/platform/drivers/aspeed-vuart/*/sirq_polarity

Date:		July 2019

Contact:	Oskar Senft <osk@google.com>

Description:	Configures the polarity of the serial interrupt to the

		host via the BMC LPC bus.

		Set to 0 for active-low or 1 for active-high.

Users:		OpenBMC.  Proposed changes should be mailed to

		openbmc@lists.ozlabs.org