Merge branch 'for-linus' into for-next

Resolve the non-trivial conflict due to the hdac regmap API changes.

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

diff --cc sound/pci/hda/hda_codec.c
index 54380ed03697f3521681942b85cfd340b4c2a7b0,b7782212dd64baace732abf7fa83d09509fba409..938ee4a6bd3ab8a6695e238576d62140ddf69d2e
--- 1/sound/pci/hda/hda_codec.c
--- 2/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@@ -436,8 -436,9 +436,9 @@@ static unsigned int get_num_devices(str
            get_wcaps_type(wcaps) != AC_WID_PIN)
                return 0;
  
-       if (_snd_hdac_read_parm(&codec->core, nid, AC_PAR_DEVLIST_LEN, &parm))
-               return 0; /* error */
+       parm = snd_hdac_read_parm_uncached(&codec->core, nid, AC_PAR_DEVLIST_LEN);
 -      if (parm == -1 && codec->bus->rirb_error)
++      if (parm == -1)
+               parm = 0;
        return parm & AC_DEV_LIST_LEN_MASK;
  }
  

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

diff --cc sound/pci/hda/patch_via.c
index 2c6c6727ca930ecda2c00d5c53cef8393352203c,bab6c04932aa050ff63f054bf172acf288f5ee5e..0521be8d46a81c08f6580e57a5a495066f22d977
--- 1/sound/pci/hda/patch_via.c
--- 2/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@@ -475,8 -481,10 +484,9 @@@ static const struct hda_codec_ops via_p
        .init = via_init,
        .free = via_free,
        .unsol_event = snd_hda_jack_unsol_event,
 -      .stream_pm = snd_hda_gen_stream_pm,
  #ifdef CONFIG_PM
        .suspend = via_suspend,
+       .resume = via_resume,
        .check_power_status = via_check_power_status,
  #endif
  };