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_HELO_NONE,SPF_PASS autolearn=no 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 79AAFC10DCE for ; Wed, 18 Mar 2020 16:55:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5518020724 for ; Wed, 18 Mar 2020 16:55:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726631AbgCRQzV convert rfc822-to-8bit (ORCPT ); Wed, 18 Mar 2020 12:55:21 -0400 Received: from muru.com ([72.249.23.125]:60734 "EHLO muru.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726506AbgCRQzV (ORCPT ); Wed, 18 Mar 2020 12:55:21 -0400 Received: from atomide.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id 0F27580B6; Wed, 18 Mar 2020 16:56:06 +0000 (UTC) Date: Wed, 18 Mar 2020 09:55:17 -0700 From: Tony Lindgren To: Stephen Rothwell Cc: Dave Airlie , DRI , Linux Next Mailing List , Linux Kernel Mailing List , Laurent Pinchart , Tomi Valkeinen Subject: Re: linux-next: manual merge of the drm tree with the omap tree Message-ID: <20200318165517.GO37466@atomide.com> References: <20200318135034.242d9edf@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: 8BIT In-Reply-To: <20200318135034.242d9edf@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org * Stephen Rothwell [200318 02:51]: > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > arch/arm/configs/omap2plus_defconfig > > between commit: > > 98c2cc359f8f ("ARM: omap2plus_defconfig: Update for moved and dropped options") > > from the omap tree and commit: > > e7e67d9a2f1d ("drm/omap: Switch the HDMI and VENC outputs to drm_bridge") > > from the drm 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. OK thanks! Tony > diff --cc arch/arm/configs/omap2plus_defconfig > index eedb26ff93f9,54f1a21de7e0..000000000000 > --- a/arch/arm/configs/omap2plus_defconfig > +++ b/arch/arm/configs/omap2plus_defconfig > @@@ -360,10 -353,10 +360,9 @@@ CONFIG_OMAP2_DSS_DSI= > CONFIG_DRM_OMAP_PANEL_DSI_CM=m > CONFIG_DRM_TILCDC=m > CONFIG_DRM_PANEL_SIMPLE=m > + CONFIG_DRM_DISPLAY_CONNECTOR=m > + CONFIG_DRM_SIMPLE_BRIDGE=m > -CONFIG_DRM_TI_TFP410=m > + CONFIG_DRM_TI_TPD12S015=m > CONFIG_DRM_PANEL_LG_LB035Q02=m > CONFIG_DRM_PANEL_NEC_NL8048HL11=m > CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m 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_HELO_NONE,SPF_PASS autolearn=no 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 EDD43C43332 for ; Thu, 19 Mar 2020 08:09:26 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9FEC42072C for ; Thu, 19 Mar 2020 08:09:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FEC42072C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 49B066E9B1; Thu, 19 Mar 2020 08:09:05 +0000 (UTC) Received: from muru.com (muru.com [72.249.23.125]) by gabe.freedesktop.org (Postfix) with ESMTP id 149786E92C for ; Wed, 18 Mar 2020 16:55:21 +0000 (UTC) Received: from atomide.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id 0F27580B6; Wed, 18 Mar 2020 16:56:06 +0000 (UTC) Date: Wed, 18 Mar 2020 09:55:17 -0700 From: Tony Lindgren To: Stephen Rothwell Subject: Re: linux-next: manual merge of the drm tree with the omap tree Message-ID: <20200318165517.GO37466@atomide.com> References: <20200318135034.242d9edf@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200318135034.242d9edf@canb.auug.org.au> X-Mailman-Approved-At: Thu, 19 Mar 2020 08:08:58 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dave Airlie , Linux Kernel Mailing List , DRI , Tomi Valkeinen , Linux Next Mailing List , Laurent Pinchart Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" * Stephen Rothwell [200318 02:51]: > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > arch/arm/configs/omap2plus_defconfig > > between commit: > > 98c2cc359f8f ("ARM: omap2plus_defconfig: Update for moved and dropped options") > > from the omap tree and commit: > > e7e67d9a2f1d ("drm/omap: Switch the HDMI and VENC outputs to drm_bridge") > > from the drm 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. OK thanks! Tony > diff --cc arch/arm/configs/omap2plus_defconfig > index eedb26ff93f9,54f1a21de7e0..000000000000 > --- a/arch/arm/configs/omap2plus_defconfig > +++ b/arch/arm/configs/omap2plus_defconfig > @@@ -360,10 -353,10 +360,9 @@@ CONFIG_OMAP2_DSS_DSI= > CONFIG_DRM_OMAP_PANEL_DSI_CM=m > CONFIG_DRM_TILCDC=m > CONFIG_DRM_PANEL_SIMPLE=m > + CONFIG_DRM_DISPLAY_CONNECTOR=m > + CONFIG_DRM_SIMPLE_BRIDGE=m > -CONFIG_DRM_TI_TFP410=m > + CONFIG_DRM_TI_TPD12S015=m > CONFIG_DRM_PANEL_LG_LB035Q02=m > CONFIG_DRM_PANEL_NEC_NL8048HL11=m > CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel