Merge branch 'for-linus' into for-next

For updating the HDMI chmap fix.

Conflicts:
	sound/pci/hda/patch_hdmi.c

diff --cc sound/pci/hda/patch_hdmi.c
index 00e0413,50173d4..b899eba
--- 1/sound/pci/hda/patch_hdmi.c
--- 2/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@@ -983,12 -952,9 +991,9 @@@ static void hdmi_setup_audio_infoframe(
        if (!hdmi_infoframe_uptodate(codec, pin_nid, ai.bytes,
                                        sizeof(ai))) {
                snd_printdd("hdmi_setup_audio_infoframe: "
 -                          "pin=%d channels=%d\n",
 +                          "pin=%d channels=%d ca=0x%02x\n",
                            pin_nid,
 -                          channels);
 +                          active_channels, ca);
-               hdmi_setup_channel_mapping(codec, pin_nid, non_pcm, ca,
-                                          channels, per_pin->chmap,
-                                          per_pin->chmap_set);
                hdmi_stop_infoframe_trans(codec, pin_nid);
                hdmi_fill_audio_infoframe(codec, pin_nid,
                                            ai.bytes, sizeof(ai));