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

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



No conflicts.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 1abea24a 551acdc3

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -13389,6 +13389,7 @@ F: net/core/drop_monitor.c 
NETWORKING DRIVERS

M:	"David S. Miller" <davem@davemloft.net>

M:	Jakub Kicinski <kuba@kernel.org>

M:	Paolo Abeni <pabeni@redhat.com>

L:	netdev@vger.kernel.org

S:	Maintained

Q:	https://patchwork.kernel.org/project/netdevbpf/list/
@@ -13435,6 +13436,7 @@ F: tools/testing/selftests/drivers/net/dsa/ 
NETWORKING [GENERAL]

M:	"David S. Miller" <davem@davemloft.net>

M:	Jakub Kicinski <kuba@kernel.org>

M:	Paolo Abeni <pabeni@redhat.com>

L:	netdev@vger.kernel.org

S:	Maintained

Q:	https://patchwork.kernel.org/project/netdevbpf/list/

Makefile

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

PATCHLEVEL = 17

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Superb Owl



# *DOCUMENTATION*

arch/arm/include/asm/spectre.h

+6 −0
Original line number Diff line number Diff line
@@ -25,7 +25,13 @@ enum { 
	SPECTRE_V2_METHOD_LOOP8 = BIT(__SPECTRE_V2_METHOD_LOOP8),

};



#ifdef CONFIG_GENERIC_CPU_VULNERABILITIES

void spectre_v2_update_state(unsigned int state, unsigned int methods);

#else

static inline void spectre_v2_update_state(unsigned int state,

					   unsigned int methods)

{}

#endif



int spectre_bhb_update_vectors(unsigned int method);

arch/arm/kernel/entry-armv.S

+2 −2
Original line number Diff line number Diff line
@@ -1040,9 +1040,9 @@ vector_bhb_loop8_\name: 


	@ bhb workaround

	mov	r0, #8

1:	b	. + 4

3:	b	. + 4

	subs	r0, r0, #1

	bne	1b

	bne	3b

	dsb

	isb

	b	2b

arch/powerpc/include/asm/nmi.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ long soft_nmi_interrupt(struct pt_regs *regs); 
static inline void arch_touch_nmi_watchdog(void) {}

#endif



#if defined(CONFIG_NMI_IPI) && defined(CONFIG_STACKTRACE)

#ifdef CONFIG_NMI_IPI

extern void arch_trigger_cpumask_backtrace(const cpumask_t *mask,

					   bool exclude_self);

#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace