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 B898AC3F2CD for ; Tue, 3 Mar 2020 08:24:24 +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 48643208C3 for ; Tue, 3 Mar 2020 08:24:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 48643208C3 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 9090B6E9E1; Tue, 3 Mar 2020 08:24:09 +0000 (UTC) Received: from muru.com (muru.com [72.249.23.125]) by gabe.freedesktop.org (Postfix) with ESMTP id 2D0186E2C4 for ; Mon, 2 Mar 2020 15:01:42 +0000 (UTC) Received: from atomide.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id 664C6809F; Mon, 2 Mar 2020 15:02:25 +0000 (UTC) Date: Mon, 2 Mar 2020 07:01:37 -0800 From: Tony Lindgren To: Tomi Valkeinen Subject: Re: [PATCH 1/3] drm/omap: Prepare DSS for probing without legacy platform data Message-ID: <20200302150137.GP37466@atomide.com> References: <20200224191230.30972-1-tony@atomide.com> <20200224191230.30972-2-tony@atomide.com> <20200224233111.gkctx27usfxj2wgz@earth.universe> <20200224234333.GD37466@atomide.com> <20200227174424.GI37466@atomide.com> <8b27dba3-2e2b-84ce-0927-685f4bfe3ab2@ti.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <8b27dba3-2e2b-84ce-0927-685f4bfe3ab2@ti.com> X-Mailman-Approved-At: Tue, 03 Mar 2020 08:24:06 +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: Nishanth Menon , Tero Kristo , Suman Anna , Laurent Pinchart , Dave Gerlach , Keerthy , Sebastian Reichel , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, "Andrew F . Davis" , Peter Ujfalusi , Faiz Abbas , Jyri Sarha , Greg Kroah-Hartman , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Roger Quadros Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" * Tomi Valkeinen [200302 10:29]: > On 27/02/2020 19:44, Tony Lindgren wrote: > > > > > FWIW, I dropped omapdss-boot-init.c in my patch series updating DSI > > > > code to use common panel infrastructure, so this will conflict. > > > > > > Hey that's great :) Sounds like we can set up an immutable branch > > > for just this $subject patch against v5.6-rc1 to resolve the > > > conflict. I can set it up for Tomi or Tomi can set it up for me, > > > whichever Tomi prefers. > > > > Do you want me to send you a pull request for just this one patch > > against v5.6-rc1? > > It's probably easier if Sebastian drops the removal patch, and instead > creates a patch that removes the panel-dsi-cm from > omapdss_of_fixups_whitelist. That change should not conflict, and > effectively makes the omapdss-boot-init.c a no-op. > > We can then remove the file later. OK for resolving the merge commit that works too. Tomi, so do you care to ack the $subject patch though so I can set up an immutable branch for us for the $subject patch? Or Tomi, do you want to set up an immutable branch for me for the $subject patch? Regards, Tony _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel