move that stuff downstream and into the only branch where it'll be
used.
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>