lkml.org 
[lkml]   [2018]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the mfd tree with the sound tree
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 and commit:
>
> 9c229127aee2 ("drm/i915: hdmi: add CEC notifier to intel_hdmi")
>
> from the mfd tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/i915/Kconfig
> index 5c607f2c707b,2d65d567d5d1..000000000000
> --- a/drivers/gpu/drm/i915/Kconfig
> +++ b/drivers/gpu/drm/i915/Kconfig
> @@@ -23,7 -23,7 +23,8 @@@ config DRM_I91
> select SYNC_FILE
> select IOSF_MBI
> select CRC32
> + select SND_HDA_I915 if SND_HDA_CORE
> + select CEC_CORE if CEC_NOTIFIER
> help
> Choose this option if you have a system that has "Intel Graphics
> Media Accelerator" or "HD Graphics" integrated graphics,

Looks good, thanks!


Takashi

\
 
 \ /
  Last update: 2018-07-20 07:03    [W:0.050 / U:3.188 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site