From: Tony Lindgren <tony@atomide.com>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Nishanth Menon <nm@ti.com>, Tero Kristo <t-kristo@ti.com>,
Suman Anna <s-anna@ti.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Dave Gerlach <d-gerlach@ti.com>, Keerthy <j-keerthy@ti.com>,
Sebastian Reichel <sre@kernel.org>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
"Andrew F . Davis" <afd@ti.com>,
Peter Ujfalusi <peter.ujfalusi@ti.com>,
Faiz Abbas <faiz_abbas@ti.com>, Jyri Sarha <jsarha@ti.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
Roger Quadros <rogerq@ti.com>
Subject: Re: [PATCH 1/3] drm/omap: Prepare DSS for probing without legacy platform data
Date: Mon, 2 Mar 2020 07:01:37 -0800 [thread overview]
Message-ID: <20200302150137.GP37466@atomide.com> (raw)
In-Reply-To: <8b27dba3-2e2b-84ce-0927-685f4bfe3ab2@ti.com>
* Tomi Valkeinen <tomi.valkeinen@ti.com> [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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-03-02 15:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-24 19:12 [PATCH 0/3] ti-sysc changes for probing DSS with dts data Tony Lindgren
2020-02-24 19:12 ` [PATCH 1/3] drm/omap: Prepare DSS for probing without legacy platform data Tony Lindgren
2020-02-24 21:40 ` Laurent Pinchart
2020-02-24 23:31 ` Sebastian Reichel
2020-02-24 23:43 ` Tony Lindgren
2020-02-27 17:44 ` Tony Lindgren
2020-03-02 10:28 ` Tomi Valkeinen
2020-03-02 15:01 ` Tony Lindgren [this message]
2020-03-03 9:18 ` Tomi Valkeinen
2020-03-03 15:36 ` Tony Lindgren
2020-02-24 19:12 ` [PATCH 2/3] bus: ti-sysc: Detect display subsystem related devices Tony Lindgren
2020-02-24 19:12 ` [PATCH 3/3] bus: ti-sysc: Implement display subsystem reset quirk Tony Lindgren
2020-03-03 6:02 ` Tomi Valkeinen
2020-03-03 15:13 ` Tony Lindgren
2020-03-03 15:35 ` Tomi Valkeinen
2020-03-03 15:44 ` Tony Lindgren
2020-03-03 15:49 ` Tony Lindgren
2020-03-04 7:02 ` Tomi Valkeinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200302150137.GP37466@atomide.com \
--to=tony@atomide.com \
--cc=afd@ti.com \
--cc=d-gerlach@ti.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=faiz_abbas@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=j-keerthy@ti.com \
--cc=jsarha@ti.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=nm@ti.com \
--cc=peter.ujfalusi@ti.com \
--cc=rogerq@ti.com \
--cc=s-anna@ti.com \
--cc=sre@kernel.org \
--cc=t-kristo@ti.com \
--cc=tomi.valkeinen@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).