David S. Miller 13091aa305 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Honestly all the conflicts were simple overlapping changes,
nothing really interesting to report.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-06-17 20:20:36 -07:00

..

boot

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 441

2019-06-05 17:37:17 +02:00

configs

net: sched: remove NET_CLS_IND config option

2019-06-15 14:06:13 -07:00

crypto

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

include

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

2019-06-17 15:55:34 -07:00

kernel

Merge tag 'powerpc-5.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2019-06-15 07:29:32 -10:00

kvm

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 266

2019-06-05 17:30:28 +02:00

lib

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 295

2019-06-05 17:36:38 +02:00

math-emu

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

mm

Merge tag 'powerpc-5.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2019-06-15 07:29:32 -10:00

net

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

2019-06-17 20:20:36 -07:00

oprofile

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 333

2019-06-05 17:37:06 +02:00

perf

Merge tag 'powerpc-5.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2019-06-02 10:21:04 -07:00

platforms

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 441

2019-06-05 17:37:17 +02:00

purgatory

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 441

2019-06-05 17:37:17 +02:00

sysdev

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 441

2019-06-05 17:37:17 +02:00

tools

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

xmon

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156

2019-05-30 11:26:35 -07:00

Kbuild

treewide: Add SPDX license identifier - Kbuild

2019-05-30 11:32:33 -07:00

Kconfig

mm: memblock: make keeping memblock memory opt-in rather than opt-out

2019-05-14 09:47:50 -07:00

Kconfig.debug

powerpc/xmon: add read-only mode

2019-05-03 02:54:57 +10:00

Makefile

treewide: prefix header search paths with $(srctree)/

2019-05-18 11:49:57 +09:00

Makefile.postlink

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00