Commit 4f797f56 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patches 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents c5105d76 63de3747

.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

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,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-class-infiniband

+0 −19
Original line number Diff line number Diff line
@@ -314,25 +314,6 @@ Description: 
		board_id:	(RO) Manufacturing board ID





sysfs interface for Chelsio T3 RDMA Driver (cxgb3)

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



What:		/sys/class/infiniband/cxgb3_X/hw_rev

What:		/sys/class/infiniband/cxgb3_X/hca_type

What:		/sys/class/infiniband/cxgb3_X/board_id

Date:		Feb, 2007

KernelVersion:	v2.6.21

Contact:	linux-rdma@vger.kernel.org

Description:

		hw_rev:		(RO) Hardware revision number



		hca_type:	(RO) HCA type. Here it is a driver short name.

				It should normally match the name in its bus

				driver structure (e.g.  pci_driver::name).



		board_id:	(RO) Manufacturing board id





sysfs interface for Mellanox ConnectX HCA IB driver (mlx4)

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

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