Re: linux-next: manual merge of the mfd tree with the sound tree

2018-08-21 Thread Geert Uytterhoeven
On Fri, Jul 20, 2018 at 5:42 AM Stephen Rothwell wrote: > Today's linux-next merge of the mfd tree got a conflict in: > > drivers/gpu/drm/i915/Kconfig > > between commit: > > a57942bfdd61 ("ALSA: hda: Make audio component support more generic") > > from the sound tree and commit: > > 9c22912

Re: linux-next: manual merge of the mfd tree with the sound tree

2018-07-19 Thread Takashi Iwai
On Fri, 20 Jul 2018 05:42:19 +0200, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the mfd tree got a conflict in: > > drivers/gpu/drm/i915/Kconfig > > between commit: > > a57942bfdd61 ("ALSA: hda: Make audio component support more generic") > > from the sound tree an