Merge branch 'for-linus' into for-next

Merge 5.4-devel branch for applying the further ALSA timer fixes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --cc sound/core/timer.c
index 219249627cc3386dc016e1e3ca1ad1960018bab0,59ae21b0bb936c0757d58573b1bac3ed3defcb1a..013f0e69ff0f719fc1d090cd10a619a7bf47734a
--- 1/sound/core/timer.c
--- 2/sound/core/timer.c
+++ b/sound/core/timer.c
@@@ -266,10 -261,9 +268,10 @@@ int snd_timer_open(struct snd_timer_ins
                timeri->slave_id = tid->device;
                timeri->flags |= SNDRV_TIMER_IFLG_SLAVE;
                list_add_tail(&timeri->open_list, &snd_timer_slave_list);
 +              num_slaves++;
                err = snd_timer_check_slave(timeri);
                if (err < 0) {
-                       snd_timer_close_locked(timeri);
+                       snd_timer_close_locked(timeri, &card_dev_to_put);
                        timeri = NULL;
                }
                goto unlock;

diff --cc sound/pci/hda/patch_hdmi.c
Simple merge