Commit 46d5e62d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



xdp_return_frame_bulk() needs to pass a xdp_buff
to __xdp_return().

strlcpy got converted to strscpy but here it makes no
functional difference, so just keep the right code.

Conflicts:
	net/netfilter/nf_tables_api.c

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 91163f82 7f376f19

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -322,6 +322,8 @@ TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn> 
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Uwe Kleine-König <ukleinek@strlen.de>

Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -740,6 +740,11 @@ S: (ask for current address) 
S: Portland, Oregon

S: USA



N: Jason Cooper

D: ARM/Marvell SOC co-maintainer

D: irqchip co-maintainer

D: MVEBU PCI DRIVER co-maintainer



N: Robin Cornelius

E: robincornelius@users.sourceforge.net

D: Ralink rt2x00 WLAN driver

MAINTAINERS

+21 −7
Original line number Diff line number Diff line
@@ -1486,10 +1486,20 @@ F: Documentation/devicetree/bindings/iommu/arm,smmu* 
F:	drivers/iommu/arm/

F:	drivers/iommu/io-pgtable-arm*













ARM AND ARM64 SoC SUB-ARCHITECTURES (COMMON PARTS)













M:	Arnd Bergmann <arnd@arndb.de>













M:	Olof Johansson <olof@lixom.net>













M:	soc@kernel.org













L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)













S:	Maintained













T:	git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git













F:	arch/arm/boot/dts/Makefile













F:	arch/arm64/boot/dts/Makefile



























ARM SUB-ARCHITECTURES















L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)















S:	Maintained













T:	git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git













T:	git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git















F:	arch/arm/mach-*/















F:	arch/arm/plat-*/
























@@ -2014,7 +2024,6 @@ M:	Philipp Zabel <philipp.zabel@gmail.com>













S:	Maintained





























ARM/Marvell Dove/MV78xx0/Orion SOC support













M:	Jason Cooper <jason@lakedaemon.net>















M:	Andrew Lunn <andrew@lunn.ch>















M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>















M:	Gregory Clement <gregory.clement@bootlin.com>









@@ -2031,7 +2040,6 @@ F:	arch/arm/plat-orion/













F:	drivers/soc/dove/





























ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SOC support













M:	Jason Cooper <jason@lakedaemon.net>















M:	Andrew Lunn <andrew@lunn.ch>















M:	Gregory Clement <gregory.clement@bootlin.com>















M:	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>










@@ -3239,7 +3247,7 @@ R:	Martin KaFai Lau <kafai@fb.com>













R:	Song Liu <songliubraving@fb.com>















R:	Yonghong Song <yhs@fb.com>















R:	John Fastabend <john.fastabend@gmail.com>













R:	KP Singh <kpsingh@chromium.org>













R:	KP Singh <kpsingh@kernel.org>















L:	netdev@vger.kernel.org















L:	bpf@vger.kernel.org















S:	Supported










@@ -3358,7 +3366,7 @@ F:	arch/x86/net/













X:	arch/x86/net/bpf_jit_comp32.c





























BPF LSM (Security Audit and Enforcement using BPF)













M:	KP Singh <kpsingh@chromium.org>













M:	KP Singh <kpsingh@kernel.org>















R:	Florent Revest <revest@chromium.org>















R:	Brendan Jackman <jackmanb@chromium.org>















L:	bpf@vger.kernel.org










@@ -4287,6 +4295,7 @@ B:	https://github.com/ClangBuiltLinux/linux/issues













C:	irc://chat.freenode.net/clangbuiltlinux















F:	Documentation/kbuild/llvm.rst















F:	scripts/clang-tools/













F:	scripts/lld-version.sh















K:	\b(?i:clang|llvm)\b





























CLEANCACHE API










@@ -9249,7 +9258,6 @@ F:	kernel/irq/



























IRQCHIP DRIVERS















M:	Thomas Gleixner <tglx@linutronix.de>













M:	Jason Cooper <jason@lakedaemon.net>















M:	Marc Zyngier <maz@kernel.org>















L:	linux-kernel@vger.kernel.org















S:	Maintained










@@ -10550,6 +10558,13 @@ S:	Supported













F:	Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst















F:	drivers/net/ethernet/marvell/octeontx2/af/



























MARVELL PRESTERA ETHERNET SWITCH DRIVER













M:	Vadym Kochan <vkochan@marvell.com>













M:	Taras Chornyi <tchornyi@marvell.com>













S:	Supported













W:	https://github.com/Marvell-switching/switchdev-prestera













F:	drivers/net/ethernet/marvell/prestera/



























MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER















M:	Nicolas Pitre <nico@fluxnic.net>















S:	Odd Fixes










@@ -13398,7 +13413,6 @@ F:	drivers/pci/controller/mobiveil/pcie-mobiveil*



























PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)















M:	Thomas Petazzoni <thomas.petazzoni@bootlin.com>













M:	Jason Cooper <jason@lakedaemon.net>















L:	linux-pci@vger.kernel.org















L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)















S:	Maintained

































Makefile



+10
−2






























Original line number
Diff line number
Diff line








@@ -2,7 +2,7 @@













VERSION = 5















PATCHLEVEL = 10















SUBLEVEL = 0













EXTRAVERSION = -rc6













EXTRAVERSION = -rc7















NAME = Kleptomaniac Octopus































# *DOCUMENTATION*










@@ -826,7 +826,9 @@ else













DEBUG_CFLAGS	+= -g















endif





























ifneq ($(LLVM_IAS),1)















KBUILD_AFLAGS	+= -Wa,-gdwarf-2













endif































ifdef CONFIG_DEBUG_INFO_DWARF4















DEBUG_CFLAGS	+= -gdwarf-4










@@ -944,7 +946,7 @@ KBUILD_CFLAGS   += $(call cc-option,-Werror=incompatible-pointer-types)













KBUILD_CFLAGS   += $(call cc-option,-Werror=designated-init)































# change __FILE__ to the relative path from the srctree













KBUILD_CFLAGS	+= $(call cc-option,-fmacro-prefix-map=$(srctree)/=)













KBUILD_CPPFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=)































# ensure -fcf-protection is disabled when using retpoline as it is















# incompatible with -mindirect-branch=thunk-extern










@@ -982,6 +984,12 @@ ifeq ($(CONFIG_RELR),y)













LDFLAGS_vmlinux	+= --pack-dyn-relocs=relr















endif





























# We never want expected sections to be placed heuristically by the













# linker. All sections should be explicitly named in the linker script.













ifdef CONFIG_LD_ORPHAN_WARN













LDFLAGS_vmlinux += --orphan-handling=warn













endif





























# Align the bit size of userspace programs with the kernel















KBUILD_USERCFLAGS  += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))















KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))

































arch/Kconfig



+9
−0






























Original line number
Diff line number
Diff line








@@ -1028,6 +1028,15 @@ config HAVE_STATIC_CALL_INLINE













	bool















	depends on HAVE_STATIC_CALL





























config ARCH_WANT_LD_ORPHAN_WARN













	bool













	help













	  An arch should select this symbol once all linker sections are explicitly













	  included, size-asserted, or discarded in the linker scripts. This is













	  important because we never want expected sections to be placed heuristically













	  by the linker, since the locations of such sections can change between linker













	  versions.





























source "kernel/gcov/Kconfig"































source "scripts/gcc-plugins/Kconfig"









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE