Merge tag 'sh-for-4.17' of git://git.libc.org/linux-sh