Merge branch 'fix/core' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...