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

Commit 16ae1f22 authored by David S. Miller's avatar David S. Miller
Browse files

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



Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmmii.c
	drivers/net/hyperv/netvsc.c
	kernel/bpf/hashtab.c

Almost entirely overlapping changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6f359f99 d038e3dc

MAINTAINERS

+2 −16
Original line number Diff line number Diff line
@@ -3223,7 +3223,6 @@ F: drivers/platform/chrome/ 


CISCO VIC ETHERNET NIC DRIVER

M:	Christian Benvenuti <benve@cisco.com>

M:	Sujith Sankar <ssujith@cisco.com>

M:	Govindarajulu Varadarajan <_govind@gmx.com>

M:	Neel Patel <neepatel@cisco.com>

S:	Supported
@@ -7781,13 +7780,6 @@ F: include/net/mac80211.h 
F:	net/mac80211/

F:	drivers/net/wireless/mac80211_hwsim.[ch]



MACVLAN DRIVER

M:	Patrick McHardy <kaber@trash.net>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/macvlan.c

F:	include/linux/if_macvlan.h



MAILBOX API

M:	Jassi Brar <jassisinghbrar@gmail.com>

L:	linux-kernel@vger.kernel.org
@@ -7860,6 +7852,8 @@ F: drivers/net/ethernet/marvell/mvneta.* 
MARVELL MWIFIEX WIRELESS DRIVER

M:	Amitkumar Karwar <akarwar@marvell.com>

M:	Nishant Sarmukadam <nishants@marvell.com>

M:	Ganapathi Bhat <gbhat@marvell.com>

M:	Xinming Hu <huxm@marvell.com>

L:	linux-wireless@vger.kernel.org

S:	Maintained

F:	drivers/net/wireless/marvell/mwifiex/
@@ -13396,14 +13390,6 @@ W: https://linuxtv.org 
S:	Maintained

F:	drivers/media/platform/vivid/*



VLAN (802.1Q)

M:	Patrick McHardy <kaber@trash.net>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/macvlan.c

F:	include/linux/if_*vlan.h

F:	net/8021q/



VLYNQ BUS

M:	Florian Fainelli <f.fainelli@gmail.com>

L:	openwrt-devel@lists.openwrt.org (subscribers-only)

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 11

SUBLEVEL = 0

EXTRAVERSION = -rc2

EXTRAVERSION = -rc3

NAME = Fearless Coyote



# *DOCUMENTATION*

arch/arm/tools/syscall.tbl

+1 −0
Original line number Diff line number Diff line
@@ -411,3 +411,4 @@ 
394	common	pkey_mprotect		sys_pkey_mprotect

395	common	pkey_alloc		sys_pkey_alloc

396	common	pkey_free		sys_pkey_free

397	common	statx			sys_statx

arch/arm64/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,10 @@ config SYSVIPC_COMPAT 
	def_bool y

	depends on COMPAT && SYSVIPC



config KEYS_COMPAT

	def_bool y

	depends on COMPAT && KEYS



endmenu



menu "Power management options"

arch/arm64/include/asm/cpufeature.h

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static inline bool system_supports_fpsimd(void) 
static inline bool system_uses_ttbr0_pan(void)

{

	return IS_ENABLED(CONFIG_ARM64_SW_TTBR0_PAN) &&

		!cpus_have_cap(ARM64_HAS_PAN);

		!cpus_have_const_cap(ARM64_HAS_PAN);

}



#endif /* __ASSEMBLY__ */