David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-02 10:55:32 -07: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	sparc64: vcc: Enable VCC module in linux	2017-08-15 21:33:50 -07:00
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-01-31 14:22:45 -08:00
include	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
kernel	sparc/time: Add missing __init to init_tick_ops()	2018-07-30 12:48:29 -07:00
lib	sparc64: repair calling incorrect hweight function from stubs	2017-12-27 20:29:48 -05: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: move MSI related definitions to where they are used	2018-07-30 13:00:56 -07:00
net	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
oprofile
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	kbuild: mark $(targets) as .SECONDARY and remove .PRECIOUS markers	2018-04-07 19:04:02 +09:00
Kbuild	vDSO for sparc	2017-11-15 14:21:03 +09:00
Kconfig	arch/*: Kconfig: fix documentation for NMI watchdog	2018-06-15 12:48:59 -03:00
Kconfig.debug	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile	kbuild: add machine size to CHECKFLAGS	2018-06-01 11:36:58 +09:00