]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit724a9cd1f7827d0024fb5920a9a80b7091825546
tree51932f197a50dde3d8623752cca73cdd82a4553e
parent3eee8b0fdf84cfac6572d52944b89b4d09914b4a
parent9c6379960d048528494229c5cb5a5bd6e9a6bc5e
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