Merge branches 'upstream/core' and 'upstream/bugfix' of git://git.kernel.org/pub...