Pull 6.8-rc devel branch.  The trivial merge conflict got resolved.
Signed-off-by: Takashi Iwai <tiwai@suse.de>