Jakub Kicinski 46d5e62dd3 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: Jakub Kicinski <kuba@kernel.org>		2020-12-11 22:29:38 -08:00
..
boot	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
configs	scsi: sr: remove references to BLK_DEV_SR_VENDOR, leave it enabled	2020-02-24 14:59:01 -05:00
crypto	crypto: sparc - rename sha256 to sha256_alg	2020-07-16 21:49:04 +10:00
include	net: Add SO_BUSY_POLL_BUDGET socket option	2020-12-01 00:09:25 +01:00
kernel	sched/idle: Fix arch_cpu_idle() vs tracing	2020-11-24 16:47:35 +01:00
lib	[regression fix] really dumb fuckup in sparc64 __csum_partial_copy() changes	2020-12-08 16:37:47 -05:00
math-emu	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
mm	dma-mapping updates for 5.10	2020-10-15 14:43:29 -07:00
net	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
oprofile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
power	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
prom
vdso	treewide: remove DISABLE_LTO	2020-10-21 00:28:53 +09:00
Kbuild	treewide: Add SPDX license identifier - Kbuild	2019-05-30 11:32:33 -07:00
Kconfig	Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2020-10-22 09:59:21 -07:00
Kconfig.debug	Kconfig: consolidate the "Kernel hacking" menu	2018-08-02 08:06:48 +09:00
Makefile	sparc: generate uapi header and system call table files	2018-11-18 18:52:22 -08:00