David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All of the conflicts were cases of overlapping changes. In net/core/devlink.c, we have to make care that the resouce size_params have become a struct member rather than a pointer to such an object. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-03-06 01:20:46 -05:00
..
boot	treewide/trivial: Remove ';;$' typo noise	2018-02-22 10:59:33 +01:00
configs	x86/unwind: Rename unwinder config options to 'CONFIG_UNWINDER_*'	2017-10-14 10:12:12 +02:00
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-02-12 08:57:21 -08:00
entry	x86/entry/64: Add instruction suffix	2018-02-28 15:18:40 +01:00
events	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-02-14 17:02:15 -08:00
hyperv	KVM changes for 4.16	2018-02-10 13:16:35 -08:00
ia32	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
include	Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-03-04 12:12:48 -08:00
kernel	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-03-04 11:40:16 -08:00
kvm	KVM fixes for v4.16-rc4	2018-03-02 19:40:43 -08:00
lib	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-02-26 09:34:21 -08: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	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-03-04 11:40:16 -08:00
net	bpf, x64: remove bpf_flush_icache	2018-02-27 09:18:58 -08:00
oprofile	x86/oprofile: Fix bogus GCC-8 warning in nmi_setup()	2018-02-21 09:54:17 +01:00
pci	pci-v4.16-changes	2018-02-06 09:59:40 -08:00
platform	x86/platform/intel-mid: Handle Intel Edison reboot correctly	2018-02-28 18:17:18 +01:00
power	x86: hibernate: fix swsusp_arch_resume() prototype	2018-02-07 12:18:23 +01:00
purgatory	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01: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-64/realmode: Add instruction suffix	2018-02-20 09:33:41 +01:00
tools	x86: Treat R_X86_64_PLT32 as R_X86_64_PC32	2018-02-22 09:01:10 -08:00
um	Merge commit 'upstream-x86-entry' into WIP.x86/mm	2017-12-17 12:58:53 +01:00
video	…
xen	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-03-04 11:40:16 -08:00
.gitignore	x86/build: Add arch/x86/tools/insn_decoder_test to .gitignore	2018-02-13 14:10:29 +01:00
Kbuild	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-09-07 09:25:15 -07:00
Kconfig	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-02-26 09:34:21 -08:00
Kconfig.cpu	x86/Kconfig: Explicitly enumerate i686-class CPUs in Kconfig	2018-02-16 10:36:39 +01:00
Kconfig.debug	Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-30 13:01:09 -08:00
Makefile	objtool, retpolines: Integrate objtool with retpoline support more closely	2018-02-21 16:54:32 +01:00
Makefile.um	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01: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