Hi Takashi,
On Wed, 14 Mar 2018 08:37:12 +0100 Takashi Iwai wrote:
>
> FYI, there was yet another fix over the relevant code, but the
> conflict resolution must be trivial as well.
OK, thanks as well.
--
Cheers,
Stephen Rothwell
pgpiIka6PJOwm.pgp
Description: OpenPGP digital signature
__
Hi Lukas,
On Wed, 14 Mar 2018 07:38:01 +0100 Lukas Wunner 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:
>
> 0
On Wed, 14 Mar 2018 07:38:01 +0100,
Lukas Wunner wrote:
>
> Dear Stephen,
>
> 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:
