summaryrefslogtreecommitdiff
path: root/Documentation/admin-guide
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2019-07-01 07:04:39 +0300
committerMichael Ellerman <mpe@ellerman.id.au>2019-07-01 07:04:39 +0300
commit8b8dc695143642c6a8bee2242f2f7af4232298ab (patch)
treec36e89fcf8594e923f14016dc33f12736fd0f5af /Documentation/admin-guide
parent3c25ab35fbc8526ac0c9b298e8a78e7ad7a55479 (diff)
parentb7cbb5240130520ba572ab1146431ad01d1f5099 (diff)
downloadlinux-8b8dc695143642c6a8bee2242f2f7af4232298ab.tar.xz
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.
Diffstat (limited to 'Documentation/admin-guide')
0 files changed, 0 insertions, 0 deletions