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
..
4xx	powerpc/4xx: Constify cpm_suspend_ops	2017-08-31 19:56:33 +10:00
8xx	powerpc/8xx: Remove CPU6 ERRATA Workaround	2018-01-16 23:47:12 +11:00
40x	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
44x	powerpc/44x/fsp2: Add irq error handlers	2017-12-11 13:03:34 +11:00
52xx	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
82xx	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
83xx	powerpc: Use of for_each_node_by_name() instead of open-coding it	2017-12-04 13:10:59 +11:00
85xx	powerpc: Use pr_warn instead of pr_warning	2017-12-04 11:54:34 +11:00
86xx	powerpc: Use pr_warn instead of pr_warning	2017-12-04 11:54:34 +11:00
512x	powerpc: Use pr_warn instead of pr_warning	2017-12-04 11:54:34 +11:00
amigaone	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
cell	powerpc/spufs: use timespec64 for timestamps	2018-01-21 15:06:20 +11:00
chrp	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
embedded6xx	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
maple	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
pasemi	powerpc: Use pr_warn instead of pr_warning	2017-12-04 11:54:34 +11:00
powermac	powerpc: make use of for_each_node_by_type() instead of open-coding it	2018-01-16 23:47:10 +11:00
powernv	Merge branch 'fixes' into next	2018-01-21 23:21:14 +11:00
ps3	Merge branch 'fixes' into next	2018-01-21 23:21:14 +11:00
pseries	Merge branch 'fixes' into next	2018-01-21 23:21:14 +11:00
fsl_uli1575.c
Kconfig	Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2017-11-15 10:14:11 -08:00
Kconfig.cputype	powerpc/8xx: Only perform perf counting when perf is in use.	2018-01-16 23:47:12 +11:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00