| commit | f1079d3a3d1f468f8faa3f506c163d44fac01912 | [log] [tgz] |
|---|---|---|
| author | Michael Ellerman <mpe@ellerman.id.au> | Sun Jun 03 20:32:02 2018 +1000 |
| committer | Michael Ellerman <mpe@ellerman.id.au> | Sun Jun 03 20:32:02 2018 +1000 |
| tree | 51932f197a50dde3d8623752cca73cdd82a4553e | |
| parent | b5240b14396dd9c781b5c759830560cdcf1b7a10 [diff] | |
| parent | faf37c44a105f3608115785f17cbbf3500f8bc71 [diff] |
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.