Merge commit 'fc69910f32' into uaccess.mips

backmerge of a build fix from mainline
This commit is contained in:
Al Viro 2017-04-06 02:07:33 -04:00
commit 054838bc01
115 changed files with 1363 additions and 295 deletions