| commit | 8b8dc695143642c6a8bee2242f2f7af4232298ab | [log] [tgz] |
|---|---|---|
| author | Michael Ellerman <mpe@ellerman.id.au> | Mon Jul 01 14:04:39 2019 +1000 |
| committer | Michael Ellerman <mpe@ellerman.id.au> | Mon Jul 01 14:04:39 2019 +1000 |
| tree | c36e89fcf8594e923f14016dc33f12736fd0f5af | |
| parent | 3c25ab35fbc8526ac0c9b298e8a78e7ad7a55479 [diff] | |
| parent | b7cbb5240130520ba572ab1146431ad01d1f5099 [diff] |
Merge branch 'fixes' into next Merge our fixes branch into next, this brings in a number of commits that fix bugs we don't want to hit in next, in particular the fix for CVE-2019-12817.