Commit 2040cf9f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents f66c0447 e42617b8

.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-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)

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