Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Sun, 3 Jun 2018 10:32:02 +0000 (20:32 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Sun, 3 Jun 2018 10:32:02 +0000 (20:32 +1000)
commitf1079d3a3d1f468f8faa3f506c163d44fac01912
tree51932f197a50dde3d8623752cca73cdd82a4553e
parentb5240b14396dd9c781b5c759830560cdcf1b7a10
parentfaf37c44a105f3608115785f17cbbf3500f8bc71
Merge branch 'fixes' into next

We ended up with an ugly conflict between fixes and next in ftrace.h
involving multiple nested ifdefs, and the automatic resolution is
wrong. So merge fixes into next so we can fix it up.
Documentation/ABI/testing/sysfs-class-cxl
arch/powerpc/include/asm/ftrace.h
arch/powerpc/include/asm/paca.h
drivers/misc/cxl/pci.c
drivers/misc/cxl/sysfs.c