David S. Miller 8b44836583 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two easy cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-04-25 23:52:29 -04:00
..
boot	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
configs	configs: get rid of obsolete CONFIG_ENABLE_WARN_DEPRECATED	2019-03-07 18:32:02 -08:00
crypto	crypto: clarify name of WEAK_KEY request flag	2019-01-25 18:41:52 +08:00
include	asm-generic: generalize asm/sockios.h	2019-04-19 14:07:40 -07:00
kernel	arch: add pidfd and io_uring syscalls everywhere	2019-04-23 13:34:17 -07:00
lib	atomics/treewide: Rename __atomic_add_unless() => atomic_fetch_add_unless()	2018-06-21 14:22:32 +02:00
math-emu	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mm	sparc: add checks for the return value of memblock_alloc*()	2019-03-12 10:04:02 -07:00
net	bpf: sparc64: Enable sparc64 jit to provide bpf_line_info	2018-12-20 02:04:53 +01:00
oprofile	sparc/oprofile: Convert timer_stop() to use synchronize_rcu()	2018-11-08 21:43:20 -08:00
power	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
prom	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
vdso	sparc: vdso: Drop implicit common-page-size linker flag	2018-12-21 11:24:38 -08:00
Kbuild	vDSO for sparc	2017-11-15 14:21:03 +09:00
Kconfig	32-bit userspace ABI: introduce ARCH_32BIT_OFF_T config option	2019-02-19 10:10:05 +01: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