Commit eb1b24a9 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Cross-merge networking fixes after downstream PR.

No conflicts or adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ba2274dc b1983d42

.mailmap

+6 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
# same person appearing not to be so or badly displayed. Also allows for

# old email addresses to map to new email addresses.

#

# For format details, see "MAPPING AUTHORS" in "man git-shortlog".

# For format details, see "man gitmailmap" or "MAPPING AUTHORS" in

# "man git-shortlog" on older systems.

#

# Please keep this list dictionary sorted.

#
@@ -177,6 +178,9 @@ Gustavo Padovan <padovan@profusion.mobi> 
Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>

Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>

Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>

Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@bqreaders.com>

Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@theobroma-systems.com>

Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@vrull.eu>

Henk Vergonet <Henk.Vergonet@gmail.com>

Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>
@@ -305,6 +309,7 @@ Marek Behún <kabel@kernel.org> <marek.behun@nic.cz> 
Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>

Mark Brown <broonie@sirena.org.uk>

Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>

Markus Schneider-Pargmann <msp@baylibre.com> <mpa@pengutronix.de>

Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>

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

Documentation/ABI/obsolete/o2cb

+2 −2
Original line number Diff line number Diff line 
What:		/sys/o2cb

Date:		Dec 2005

KernelVersion:	2.6.16

Contact:	ocfs2-devel@oss.oracle.com

Contact:	ocfs2-devel@lists.linux.dev

Description:	Ocfs2-tools looks at 'interface-revision' for versioning

		information. Each logmask/ file controls a set of debug prints

		and can be written into with the strings "allow", "deny", or

		"off". Reading the file returns the current state.

		Was renamed to /sys/fs/u2cb/

Users:		ocfs2-tools. It's sufficient to mail proposed changes to

		ocfs2-devel@oss.oracle.com.
 
		ocfs2-devel@lists.linux.dev.

Documentation/ABI/removed/o2cb

+2 −2
Original line number Diff line number Diff line 
What:		/sys/o2cb symlink

Date:		May 2011

KernelVersion:	3.0

Contact:	ocfs2-devel@oss.oracle.com

Contact:	ocfs2-devel@lists.linux.dev

Description:	This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is

		removed when new versions of ocfs2-tools which know to look

		in /sys/fs/o2cb are sufficiently prevalent. Don't code new

		software to look here, it should try /sys/fs/o2cb instead.

Users:		ocfs2-tools. It's sufficient to mail proposed changes to

		ocfs2-devel@oss.oracle.com.
 
		ocfs2-devel@lists.linux.dev.

Documentation/ABI/stable/o2cb

+2 −2
Original line number Diff line number Diff line 
What:		/sys/fs/o2cb/

Date:		Dec 2005

KernelVersion:	2.6.16

Contact:	ocfs2-devel@oss.oracle.com

Contact:	ocfs2-devel@lists.linux.dev

Description:	Ocfs2-tools looks at 'interface-revision' for versioning

		information. Each logmask/ file controls a set of debug prints

		and can be written into with the strings "allow", "deny", or

		"off". Reading the file returns the current state.

Users:		ocfs2-tools. It's sufficient to mail proposed changes to

		ocfs2-devel@oss.oracle.com.
 
		ocfs2-devel@lists.linux.dev.

Documentation/ABI/testing/sysfs-ocfs2

+6 −6
Original line number Diff line number Diff line 
What:		/sys/fs/ocfs2/

Date:		April 2008

Contact:	ocfs2-devel@oss.oracle.com

Contact:	ocfs2-devel@lists.linux.dev

Description:

		The /sys/fs/ocfs2 directory contains knobs used by the

		ocfs2-tools to interact with the filesystem.



What:		/sys/fs/ocfs2/max_locking_protocol

Date:		April 2008

Contact:	ocfs2-devel@oss.oracle.com

Contact:	ocfs2-devel@lists.linux.dev

Description:

		The /sys/fs/ocfs2/max_locking_protocol file displays version

		of ocfs2 locking supported by the filesystem.  This version
@@ -28,7 +28,7 @@ Description: 


What:		/sys/fs/ocfs2/loaded_cluster_plugins

Date:		April 2008

Contact:	ocfs2-devel@oss.oracle.com

Contact:	ocfs2-devel@lists.linux.dev

Description:

		The /sys/fs/ocfs2/loaded_cluster_plugins file describes

		the available plugins to support ocfs2 cluster operation.
@@ -48,7 +48,7 @@ Description: 


What:		/sys/fs/ocfs2/active_cluster_plugin

Date:		April 2008

Contact:	ocfs2-devel@oss.oracle.com

Contact:	ocfs2-devel@lists.linux.dev

Description:

		The /sys/fs/ocfs2/active_cluster_plugin displays which

		cluster plugin is currently in use by the filesystem.
@@ -65,7 +65,7 @@ Description: 


What:		/sys/fs/ocfs2/cluster_stack

Date:		April 2008

Contact:	ocfs2-devel@oss.oracle.com

Contact:	ocfs2-devel@lists.linux.dev

Description:

		The /sys/fs/ocfs2/cluster_stack file contains the name

		of current ocfs2 cluster stack.  This value is set by
@@ -86,4 +86,4 @@ Description: 
		stack return an error.



Users:

	ocfs2-tools <ocfs2-tools-devel@oss.oracle.com>
 
	ocfs2-tools <ocfs2-tools-devel@lists.linux.dev>