From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0A89ECDFB8 for ; Fri, 20 Jul 2018 05:02:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A027C20856 for ; Fri, 20 Jul 2018 05:02:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A027C20856 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727381AbeGTFtO (ORCPT ); Fri, 20 Jul 2018 01:49:14 -0400 Received: from mx2.suse.de ([195.135.220.15]:49584 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727056AbeGTFtN (ORCPT ); Fri, 20 Jul 2018 01:49:13 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id D5227AF41; Fri, 20 Jul 2018 05:02:48 +0000 (UTC) Date: Fri, 20 Jul 2018 07:02:48 +0200 Message-ID: From: Takashi Iwai To: Stephen Rothwell Cc: Lee Jones , Linux-Next Mailing List , Linux Kernel Mailing List , Neil Armstrong Subject: Re: linux-next: manual merge of the mfd tree with the sound tree In-Reply-To: <20180720134219.680ae314@canb.auug.org.au> References: <20180720134219.680ae314@canb.auug.org.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/26 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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