Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e2d6f03 authored by David S. Miller's avatar David S. Miller
Browse files

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



net/sched/cls_api.c has overlapping changes to a call to
nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL
to the 5th argument, and another (from 'net-next') added cb->extack
instead of NULL to the 6th argument.

net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to
code which moved (to mr_table_dump)) in 'net-next'.  Thanks to David
Ahern for the heads up.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9333f207 48995423

Documentation/core-api/idr.rst

+1 −1
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: CC-BY-SA-4.0

.. SPDX-License-Identifier: GPL-2.0+



=============

ID Allocation

LICENSES/other/CC-BY-SA-4.0

deleted100644 → 0
+0 −397

File deleted.

Preview size limit exceeded, changes collapsed.

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -10161,7 +10161,6 @@ L: netdev@vger.kernel.org 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git

S:	Maintained

F:	net/core/flow.c

F:	net/xfrm/

F:	net/key/

F:	net/ipv4/xfrm*
@@ -13101,7 +13100,7 @@ SELINUX SECURITY MODULE 
M:	Paul Moore <paul@paul-moore.com>

M:	Stephen Smalley <sds@tycho.nsa.gov>

M:	Eric Paris <eparis@parisplace.org>

L:	selinux@tycho.nsa.gov (moderated for non-subscribers)

L:	selinux@vger.kernel.org

W:	https://selinuxproject.org

W:	https://github.com/SELinuxProject

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Merciless Moray



# *DOCUMENTATION*

arch/arm/kvm/coproc.c

+4 −4
Original line number Diff line number Diff line
@@ -478,15 +478,15 @@ static const struct coproc_reg cp15_regs[] = { 


	/* ICC_SGI1R */

	{ CRm64(12), Op1( 0), is64, access_gic_sgi},

	/* ICC_ASGI1R */

	{ CRm64(12), Op1( 1), is64, access_gic_sgi},

	/* ICC_SGI0R */

	{ CRm64(12), Op1( 2), is64, access_gic_sgi},



	/* VBAR: swapped by interrupt.S. */

	{ CRn(12), CRm( 0), Op1( 0), Op2( 0), is32,

			NULL, reset_val, c12_VBAR, 0x00000000 },



	/* ICC_ASGI1R */

	{ CRm64(12), Op1( 1), is64, access_gic_sgi},

	/* ICC_SGI0R */

	{ CRm64(12), Op1( 2), is64, access_gic_sgi},

	/* ICC_SRE */

	{ CRn(12), CRm(12), Op1( 0), Op2(5), is32, access_gic_sre },