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
..
appldata	s390: add a few more SPDX identifiers	2017-12-05 07:51:09 +01:00
boot	s390: add a few more SPDX identifiers	2017-12-05 07:51:09 +01:00
configs	s390: Remove CONFIG_HARDENED_USERCOPY	2017-11-16 13:12:21 +01:00
crypto	s390: Remove redudant license text	2017-12-05 07:51:09 +01:00
hypfs	s390: add a few more SPDX identifiers	2017-12-05 07:51:09 +01:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-23 13:51:56 -05:00
kernel	kernel: make groups_sort calling a responsibility group_info allocators	2017-12-14 16:00:49 -08:00
kvm	KVM: s390: wire up bpb feature	2018-01-20 17:30:47 +01:00
lib	s390: fix preemption race in disable_sacf_uaccess	2017-12-15 15:05:21 +01:00
mm	s390/mm: fix off-by-one bug in 5-level page table handling	2017-12-05 07:51:09 +01:00
net	bpf: get rid of pure_initcall dependency to enable jits	2018-01-19 18:37:00 -08:00
numa	s390: add a few more SPDX identifiers	2017-12-05 07:51:09 +01:00
oprofile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
pci	s390/pci: handle insufficient resources during dma tlb flush	2017-12-13 10:51:33 +01:00
tools	s390: add a few more SPDX identifiers	2017-12-05 07:51:09 +01:00
Kbuild	s390: add a few more SPDX identifiers	2017-12-05 07:51:09 +01:00
Kconfig	s390/perf: add perf_regs support and user stack dump	2017-11-16 15:06:11 +01: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	s390: Remove redundant license text	2017-11-24 15:37:24 +01:00
defconfig	s390: update defconfig	2017-10-16 08:19:28 +02:00