Hi Lukas,
On Wed, 14 Mar 2018 07:38:01 +0100 Lukas Wunner <lukas@xxxxxxxxx> wrote:
>
> when rebuilding linux-next you're going to see a merge conflict in:
>
> sound/pci/hda/hda_intel.c
>
> betwen commit:
>
> 1ba8f9d30817 ("ALSA: hda: Add a power_save blacklist")
>
> from the sound tree and commit:
>
> 07f4f97d7b4b ("vga_switcheroo: Use device link for HDA controller")
>
> from the drm-misc tree.
>
> I recommend fixing it up like below.
Thanks very much for the heads up and resolution. I'll still report
this when I get to it just to make sure I gate it right.
--
Cheers,
Stephen Rothwell
Attachment:
pgpB14BcfzKgW.pgp
Description: OpenPGP digital signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
