Merge branch 'stable/for-linus-4.17' of git://git.kernel.org/pub/scm/linux/kernel...