David S. Miller b2d6cee117 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The bpf syscall and selftests conflicts were trivial overlapping changes. The r8169 change involved moving the added mdelay from 'net' into a different function. A TLS close bug fix overlapped with the splitting of the TLS state into separate TX and RX parts. I just expanded the tests in the bug fix from "ctx->conf == X" into "ctx->tx_conf == X && ctx->rx_conf == X". Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-11 20:53:22 -04:00
..
boot	powerpc updates for 4.17	2018-04-07 12:08:19 -07:00
configs	scsi: remove the fdomain and fdomain_cs drivers	2018-03-19 22:54:47 -04:00
crypto	crypto: hash - annotate algorithms taking optional key	2018-01-12 23:03:35 +11:00
include	powerpc/pseries: Fix CONFIG_NUMA=n build	2018-05-08 14:59:56 +10:00
kernel	powerpc: Fix deadlock with multiple calls to smp_send_stop	2018-04-27 16:35:57 +10:00
kvm	powerpc/kvm/booke: Fix altivec related build break	2018-04-27 16:36:03 +10:00
lib	powerpc/lib: Fix off-by-one in alternate feature patching	2018-04-17 00:37:48 +10: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	powerpc/mm: Flush cache on memory hot(un)plug	2018-04-24 09:46:56 +10:00
net	bpf, ppc64: remove ld_abs/ld_ind	2018-05-03 16:49:20 -07:00
oprofile	powerpc: Use sizeof(*foo) rather than sizeof(struct foo)	2018-03-20 16:47:53 +11:00
perf	powerpc updates for 4.17	2018-04-07 12:08:19 -07:00
platforms	rtc: opal: Fix OPAL RTC driver OPAL_BUSY loops	2018-04-25 13:24:13 +10:00
purgatory	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
sysdev	powerpc/xive: Fix trying to "push" an already active pool VP	2018-04-19 00:49:45 +10:00
tools	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
xmon	Merge branch 'topic/paca' into next	2018-03-31 09:09:36 +11:00
Kconfig	kexec_file: make use of purgatory optional	2018-04-13 17:10:27 -07:00
Kconfig.debug	powerpc: Add new kconfig CONFIG_PPC_IRQ_SOFT_MASK_DEBUG	2018-01-19 22:37:03 +11:00
Makefile	powerpc/64s: Add POWER9 CPU type selection	2018-04-01 22:15:32 +10: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