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 268

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

configs

x86/defconfig: Remove archaic partition tables support

2019-04-19 12:29:48 +02:00

crypto

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

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

entry

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

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

events

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

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

hyperv

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

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

ia32

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

include

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2019-06-16 07:28:14 -10:00

kernel

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2019-06-16 07:28:14 -10:00

kvm

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

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

lib

Merge tag 'spdx-5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2019-06-08 12:52:42 -07:00

math-emu

x86/fpu: Always init the state in fpu__clear()

2019-04-09 19:28:06 +02:00

mm

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2019-06-16 07:28:14 -10:00

net

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

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

oprofile

x86/oprofile: Fix bogus GCC-8 warning in nmi_setup()

2018-02-21 09:54:17 +01:00

pci

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

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

platform

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

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

power

Merge tag 'spdx-5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2019-06-08 12:52:42 -07:00

purgatory

kbuild: move bin2c back to scripts/ from scripts/basic/

2018-07-18 01:18:05 +09:00

ras

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

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

realmode

x86/realmode: Make set_real_mode_mem() static inline

2019-03-29 10:16:27 +01:00

tools

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

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

um

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

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

video

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

xen

Merge tag 'for-linus-5.2b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2019-05-15 18:44:52 -07:00

.gitignore

x86/build: Add arch/x86/tools/insn_decoder_test to .gitignore

2018-02-13 14:10:29 +01:00

Kbuild

treewide: Add SPDX license identifier - Kbuild

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

Kconfig

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2019-05-16 11:02:27 -07:00

Kconfig.cpu

x86/cpu: Create Hygon Dhyana architecture support file

2018-09-27 16:14:05 +02:00

Kconfig.debug

compiler: allow all arches to enable CONFIG_OPTIMIZE_INLINING

2019-05-14 19:52:48 -07:00

Makefile

x86/build: Keep local relocations with ld.lld

2019-04-05 12:34:35 +02:00

Makefile_32.cpu

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

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

Makefile.um

x86, powerpc: Remove -funit-at-a-time compiler option entirely

2018-12-09 11:55:32 +01:00