diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-01-21 15:21:14 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-01-21 15:21:14 +0300 |
| commit | ebf0b6a8b1e445d2be66087732aafcda12ab9f59 (patch) | |
| tree | f00716a1dbde6b54dea5469ef209baac01883ec3 /arch/powerpc/include/asm/edac.h | |
| parent | 5400fc229e6078a6964b15fb98e9a994df3d642a (diff) | |
| parent | 1b689a95ce7427075f9ac9fb4aea1af530742b7f (diff) | |
| download | linux-ebf0b6a8b1e445d2be66087732aafcda12ab9f59.tar.xz | |
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.
Diffstat (limited to 'arch/powerpc/include/asm/edac.h')
0 files changed, 0 insertions, 0 deletions