David S. Miller 5ca114400d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in 'net'. The esp{4,6}_offload.c conflicts were overlapping changes. The 'out' label is removed so we just return ERR_PTR(-EINVAL) directly. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-01-23 13:51:56 -05:00
..
boot	Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-12-31 13:13:56 -08:00
configs	x86/unwind: Rename unwinder config options to 'CONFIG_UNWINDER_*'	2017-10-14 10:12:12 +02:00
crypto	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-14 09:51:25 -08:00
entry	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-21 10:48:35 -08:00
events	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-17 12:26:37 -08:00
hyperv	Char/Misc patches for 4.15-rc1	2017-11-16 09:10:59 -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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-23 13:51:56 -05:00
kernel	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-21 10:48:35 -08:00
kvm	KVM/x86: Fix wrong macro references of X86_CR0_PG_BIT and X86_CR4_PAE_BIT in kvm_valid_sregs()	2018-01-17 15:01:11 +01:00
lib	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-23 13:51:56 -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	x86: Use __nostackprotect for sme_encrypt_kernel	2018-01-20 17:22:54 -08:00
net	bpf, x86: small optimization in alu ops with imm	2018-01-19 18:37:00 -08:00
oprofile	Modules updates for v4.15	2017-11-15 13:46:33 -08:00
pci	x86/PCI: Move and shrink AMD 64-bit window to avoid conflict	2018-01-11 12:01:58 -06:00
platform	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-14 09:51:25 -08:00
power	Merge branch 'WIP.x86-pti.entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-12-18 08:59:15 -08: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/realmode: Don't decrypt trampoline area under SEV	2017-11-07 15:35:55 +01:00
tools	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
um	Merge commit 'upstream-x86-entry' into WIP.x86/mm	2017-12-17 12:58:53 +01:00
video	…
xen	xen: fixes for 4.15-rc8	2018-01-12 10:00:15 -08:00
.gitignore	…
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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-17 00:10:42 -05:00
Kconfig.cpu	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Kconfig.debug	Merge commit 'upstream-x86-entry' into WIP.x86/mm	2017-12-17 12:58:53 +01:00
Makefile	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-01-14 15:30:02 -08: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