Merge branches 'for-5.1/upstream-fixes' and 'for-5.2/core' into for-linus