Michael Ellerman 95dff480bb Merge branch 'fixes' into next ... Merge our fixes branch from the 4.16 cycle. There were a number of important fixes merged, in particular some Power9 workarounds that we want in next for testing purposes. There's also been some conflicting changes in the CPU features code which are best merged and tested before going upstream.		2018-03-28 22:59:50 +11:00
..
boot	Merge branch 'fixes' into next	2018-03-28 22:59:50 +11:00
configs	powerpc updates for 4.16	2018-02-02 10:01:04 -08:00
crypto	crypto: hash - annotate algorithms taking optional key	2018-01-12 23:03:35 +11:00
include	Merge branch 'fixes' into next	2018-03-28 22:59:50 +11:00
kernel	Merge branch 'fixes' into next	2018-03-28 22:59:50 +11:00
kvm	Merge branch 'fixes' into next	2018-03-28 22:59:50 +11:00
lib	powerpc/rfi-flush: Differentiate enabled and patched flush types	2018-03-27 19:25:14 +11: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 'fixes' into next	2018-03-28 22:59:50 +11:00
net	powerpc/bpf/jit: Fix 32-bit JIT for seccomp_data access	2018-02-22 14:36:08 +11:00
oprofile	powerpc: Use sizeof(*foo) rather than sizeof(struct foo)	2018-03-20 16:47:53 +11:00
perf	powerpc/perf: Add blacklisted events for Power9 DD2.2	2018-03-27 19:25:11 +11:00
platforms	powerpc/eeh: Add eeh_state_active() helper	2018-03-27 23:45:19 +11: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: Use hw CPU ids when configuring the CPU queues	2018-02-15 09:54:43 +11: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/ppc-kvm' into next	2018-03-27 23:55:49 +11:00
Kconfig	Merge branch 'linus' into sched/urgent, to resolve conflicts	2018-02-06 21:12:31 +01:00
Kconfig.debug	powerpc: Add new kconfig CONFIG_PPC_IRQ_SOFT_MASK_DEBUG	2018-01-19 22:37:03 +11:00
Makefile	powerpc: Keep const vars out of writable .sdata	2018-03-06 09:21:21 +11: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