linux_dsm_epyc7002/arch/powerpc/platforms/ps3
Michael Ellerman ebf0b6a8b1 Merge branch 'fixes' into next
Merge our fixes branch from the 4.15 cycle.

Unusually the fixes branch saw some significant features merged,
notably the RFI flush patches, so we want the code in next to be
tested against that, to avoid any surprises when the two are merged.

There's also some other work on the panic handling that was reverted
in fixes and we now want to do properly in next, which would conflict.

And we also fix a few other minor merge conflicts.
2018-01-21 23:21:14 +11:00
..
device-init.c powerpc: Use pr_warn instead of pr_warning 2017-12-04 11:54:34 +11:00
exports.c powerpc: remove non-required uses of include <linux/module.h> 2011-10-31 19:30:44 -04:00
gelic_udbg.c powerpc/ps3: gelic_udbg: use struct udphdr from <linux/udp.h> 2016-03-01 19:27:20 +11:00
htab.c powerpc/64: Simplify adaptation to new ISA v3.00 HPTE format 2016-11-16 15:43:25 +11:00
hvcall.S [POWERPC] ps3: add lv1 hvcalls 2006-12-04 20:40:44 +11:00
interrupt.c powerpc: Remove all usages of NO_IRQ 2016-09-20 20:57:12 +10:00
Kconfig License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mm.c powerpc: Use pr_warn instead of pr_warning 2017-12-04 11:54:34 +11:00
os-area.c powerpc: Use pr_warn instead of pr_warning 2017-12-04 11:54:34 +11:00
platform.h powerpc/ps3: Add empty repository highmem routines 2015-01-22 17:31:21 +11:00
repository.c powerpc: Squash lines for simple wrapper functions 2017-08-31 14:26:42 +10:00
setup.c Revert "powerpc: Do not call ppc_md.panic in fadump panic notifier" 2017-12-05 23:21:46 +11:00
smp.c powerpc: Add NMI IPI infrastructure 2017-04-28 21:02:25 +10:00
spu.c powerpc: Remove all usages of NO_IRQ 2016-09-20 20:57:12 +10:00
system-bus.c powerpc: ps3: use dev_groups and not dev_attrs for bus_type 2017-06-09 11:00:46 +02:00
time.c char/genrtc: remove powerpc support 2016-06-04 00:23:35 +02:00