Merge branch 'for-4.17/upstream' into for-linus

Pull a few small generic code cleanups.