From: Tony Lindgren <tony@atomide.com>
To: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
linux-fbdev@vger.kernel.org, devicetree@vger.kernel.org,
Archit Taneja <archit@ti.com>,
Darren Etheridge <detheridge@ti.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Stefan Roese <stefan.roese@gmail.com>,
Sebastian Reichel <sre@debian.org>,
Robert Nelson <robertcnelson@gmail.com>,
"Dr . H . Nikolaus Schaller" <hns@goldelico.com>,
Marek Belisko <marek@goldelico.com>,
Sebastian Reichel <sre@ring0.de>,
Javier Martinez Canillas <javier@dowhile0.org>,
Enric Balletbo Serra <eballetbo@gmail.com>,
Florian Vaussard <florian.vaussard@epfl.ch>
Subject: Re: [PATCHv3 00/41] OMAPDSS: DT support v3
Date: Fri, 7 Mar 2014 08:49:29 -0800 [thread overview]
Message-ID: <20140307164929.GC3789@atomide.com> (raw)
In-Reply-To: <531823C5.1020008@ti.com>
* Tomi Valkeinen <tomi.valkeinen@ti.com> [140305 23:32]:
> Hi Tony,
>
> On 21/01/14 12:56, Tomi Valkeinen wrote:
> > Hi,
> >
> > Here's version 3 of the DSS DT series.
>
> Can you have a look at the arch/arm/ parts in the series and ack if
> they're ok, i.e, patches 1, 2, 32.
Patches 1, 2 & 32 look OK to me, so for those please feel free to add:
Acked-by: Tony Lindgren <tony@atomide.com>
There's a minor merge conflict in pdata-quirks.c, but that's trivial
so it should be OK for you to queue those along with the DSS patches.
> Then there are the .dts patches, 22-30, for which I haven't been able to
> get any acks. I'm not sure who I should get acks from for those, but I
> don't mind adding yours if you want to give it.
>
> The .dts patches have had minor changes compared to the ones posted
> here, according to the DT bindings review comments, but nothing much has
> changed.
These will cause unnecessary merge conflicts all over the place:
Auto-merging arch/arm/boot/dts/omap4.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/omap4.dtsi
Auto-merging arch/arm/boot/dts/omap4-sdp.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/omap4-sdp.dts
Auto-merging arch/arm/boot/dts/omap4-panda-common.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/omap4-panda-common.dtsi
Auto-merging arch/arm/boot/dts/omap3.dtsi
Auto-merging arch/arm/boot/dts/omap3-n900.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/omap3-n900.dts
Auto-merging arch/arm/boot/dts/omap3-igep0020.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/omap3-igep0020.dts
Auto-merging arch/arm/boot/dts/omap3-beagle.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/omap3-beagle.dts
Auto-merging arch/arm/boot/dts/omap3-beagle-xm.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/omap3-beagle-xm.dts
How about do a pull request for just the .dts changes against current
omap-for-v3.15/dt branch ASAP for me so I can pull it in? That is assuming
that just the .dts changes alone won't break anything.
Then make sure your series works both ways and maybe do a follow up
patch that flips things over after the dependencies are merged.
Regards,
Tony
next prev parent reply other threads:[~2014-03-07 16:49 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-21 10:56 [PATCHv3 00/41] OMAPDSS: DT support v3 Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 01/41] ARM: OMAP2+: add omapdss_init_of() Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 02/41] ARM: OMAP2+: DT 'compatible' tweak for displays Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 03/41] OMAPDSS: add 'label' support for DT Tomi Valkeinen
[not found] ` <1390301833-24944-1-git-send-email-tomi.valkeinen-l0cyMroinI0@public.gmane.org>
2014-01-21 10:56 ` [PATCHv3 04/41] OMAPDSS: get dssdev->alias from DT alias Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 09/41] OMAPDSS: Add DT support to DSS Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 26/41] ARM: omap4-sdp.dts: add display information Tomi Valkeinen
2014-01-21 10:57 ` [PATCHv3 29/41] ARM: omap3-igep0020.dts: " Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 05/41] OMAPFB: clean up default display search Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 06/41] OMAPFB: search for default display with DT alias Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 07/41] OMAPDSS: add of helpers Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 08/41] OMAPDSS: Improve regulator names for DT Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 10/41] OMAPDSS: Add DT support to DISPC Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 11/41] OMAPDSS: Add DT support to HDMI Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 12/41] OMAPDSS: Add DT support to VENC Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 13/41] OMAPDSS: Add DT support to DSI Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 14/41] OMAPDSS: panel-dsi-cm: Add DT support Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 15/41] OMAPDSS: encoder-tfp410: " Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 16/41] OMAPDSS: connector-dvi: " Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 17/41] OMAPDSS: encoder-tpd12s015: " Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 18/41] OMAPDSS: hdmi-connector: " Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 19/41] OMAPDSS: panel-dpi: " Tomi Valkeinen
2014-04-08 0:13 ` Tony Lindgren
2014-04-08 5:38 ` Tomi Valkeinen
2014-04-08 15:29 ` Tony Lindgren
2014-04-18 15:51 ` Tony Lindgren
2014-04-24 9:52 ` Tomi Valkeinen
[not found] ` <5358DEEA.1000506-l0cyMroinI0@public.gmane.org>
2014-04-24 12:44 ` Laurent Pinchart
2014-04-24 13:12 ` Tomi Valkeinen
2014-04-25 23:53 ` Tony Lindgren
[not found] ` <20140425235348.GH20807-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2014-04-28 10:43 ` Tomi Valkeinen
2014-04-28 16:13 ` Tony Lindgren
2014-01-21 10:56 ` [PATCHv3 20/41] OMAPDSS: connector-analog-tv: " Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 21/41] OMAPDSS: acx565akm: " Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 22/41] ARM: omap2.dtsi: add omapdss information Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 23/41] ARM: omap3.dtsi: " Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 24/41] ARM: omap4.dtsi: " Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 25/41] ARM: omap4-panda.dts: add display information Tomi Valkeinen
2014-01-21 10:56 ` [PATCHv3 27/41] ARM: omap3-beagle.dts: " Tomi Valkeinen
2014-01-21 10:57 ` [PATCHv3 28/41] ARM: omap3-beagle-xm.dts: " Tomi Valkeinen
2014-01-21 10:57 ` [PATCHv3 30/41] ARM: omap3-n900.dts: " Tomi Valkeinen
2014-01-21 15:26 ` Sebastian Reichel
2014-01-24 11:46 ` Tomi Valkeinen
2014-01-21 10:57 ` [PATCHv3 31/41] OMAPDSS: remove DT hacks for regulators Tomi Valkeinen
2014-01-21 10:57 ` [PATCHv3 32/41] ARM: OMAP2+: remove pdata quirks for displays Tomi Valkeinen
2014-01-21 10:57 ` [PATCHv3 33/41] Doc/DT: Add OMAP DSS DT Bindings Tomi Valkeinen
2014-01-21 10:57 ` [PATCHv3 34/41] Doc/DT: Add DT binding documentation for Analog TV Connector Tomi Valkeinen
2014-01-21 10:57 ` [PATCHv3 35/41] Doc/DT: Add DT binding documentation for DVI Connector Tomi Valkeinen
2014-01-21 10:57 ` [PATCHv3 36/41] Doc/DT: Add DT binding documentation for HDMI Connector Tomi Valkeinen
2014-01-21 10:57 ` [PATCHv3 37/41] Doc/DT: Add DT binding documentation for MIPI DPI Panel Tomi Valkeinen
2014-01-21 10:57 ` [PATCHv3 38/41] Doc/DT: Add DT binding documentation for MIPI DSI CM Panel Tomi Valkeinen
2014-01-21 10:57 ` [PATCHv3 39/41] Doc/DT: Add DT binding documentation for Sony acx565akm panel Tomi Valkeinen
2014-01-21 15:28 ` Sebastian Reichel
2014-01-21 10:57 ` [PATCHv3 40/41] Doc/DT: Add DT binding documentation for TFP410 encoder Tomi Valkeinen
2014-01-21 10:57 ` [PATCHv3 41/41] Doc/DT: Add DT binding documentation for tpd12s015 encoder Tomi Valkeinen
2014-01-21 21:29 ` [PATCHv3 00/41] OMAPDSS: DT support v3 Nishanth Menon
2014-01-22 8:41 ` Tomi Valkeinen
2014-01-26 23:07 ` Javier Martinez Canillas
2014-03-06 7:29 ` Tomi Valkeinen
2014-03-07 16:49 ` Tony Lindgren [this message]
2014-03-10 13:22 ` Tomi Valkeinen
2014-03-10 15:41 ` Tony Lindgren
2014-03-11 10:15 ` Tomi Valkeinen
2014-03-11 16:28 ` Tony Lindgren
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=20140307164929.GC3789@atomide.com \
--to=tony@atomide.com \
--cc=archit@ti.com \
--cc=detheridge@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=eballetbo@gmail.com \
--cc=florian.vaussard@epfl.ch \
--cc=hns@goldelico.com \
--cc=javier@dowhile0.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=marek@goldelico.com \
--cc=robertcnelson@gmail.com \
--cc=sre@debian.org \
--cc=sre@ring0.de \
--cc=stefan.roese@gmail.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).