devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Russell King - ARM Linux <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
To: Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
	kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Subject: Re: [PATCH 1/9] ARM: dts: imx6qdl: remove the use of pingrp macros
Date: Mon, 27 Jan 2014 14:37:45 +0000	[thread overview]
Message-ID: <20140127143745.GM15937@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <1390668191-20289-2-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

On Sun, Jan 26, 2014 at 12:43:03AM +0800, Shawn Guo wrote:
>  arch/arm/boot/dts/imx6dl-hummingboard.dts  |    5 +-
>  arch/arm/boot/dts/imx6qdl-microsom.dtsi    |    5 +-

I've merged your changes here into my local copy of these just to reduce
the conflicts - unfortunately, it's taken soo long to deal with the above
that the cubox-i has now been released, which has prompted some
reorganisation between the above two files.

I would much rather you dropped these two entirely, and let me push them
upstream, rather than having some nasty conflicts which result from this.

-- 
FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up.  Estimation
in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad.
Estimate before purchase was "up to 13.2Mbit".
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2014-01-27 14:37 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-25 16:43 [PATCH 0/9] ARM: dts: imx: remove the use of pingrp macros Shawn Guo
     [not found] ` <1390668191-20289-1-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-01-25 16:43   ` [PATCH 1/9] ARM: dts: imx6qdl: " Shawn Guo
     [not found]     ` <1390668191-20289-2-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-01-27 14:37       ` Russell King - ARM Linux [this message]
     [not found]         ` <20140127143745.GM15937-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2014-01-27 15:05           ` Shawn Guo
     [not found]             ` <20140127150509.GD4765-rvtDTF3kK1ictlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>
2014-01-27 15:16               ` Russell King - ARM Linux
     [not found]                 ` <20140127151638.GN15937-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>
2014-01-27 15:22                   ` Shawn Guo
2014-01-28 10:30           ` Shawn Guo
2014-01-25 16:43   ` [PATCH 2/9] ARM: dts: imx6sl: " Shawn Guo
     [not found]     ` <1390668191-20289-3-git-send-email-shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-01-28 10:17       ` Heiko Stübner
2014-01-28 11:03         ` Sascha Hauer
2014-01-28 11:20         ` Shawn Guo
     [not found]           ` <20140128112047.GC20583-rvtDTF3kK1ictlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>
2014-01-29 10:42             ` Heiko Stübner
2014-01-25 16:43   ` [PATCH 3/9] ARM: dts: imx53: " Shawn Guo
2014-01-25 16:43   ` [PATCH 4/9] ARM: dts: imx51: " Shawn Guo
2014-01-25 16:43   ` [PATCH 5/9] ARM: dts: imx50: " Shawn Guo
2014-01-25 16:43   ` [PATCH 6/9] ARM: dts: imx35: " Shawn Guo
2014-01-25 16:43   ` [PATCH 7/9] ARM: dts: imx25: " Shawn Guo
2014-01-25 16:43   ` [PATCH 8/9] ARM: dts: imx27: " Shawn Guo
2014-01-25 16:43   ` [PATCH 9/9] ARM: dts: vf610: " Shawn Guo
2014-01-27 14:04   ` [PATCH 0/9] ARM: dts: imx: " Rob Herring
2014-01-27 17:47   ` Olof Johansson

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=20140127143745.GM15937@n2100.arm.linux.org.uk \
    --to=linux-lfz/pmaqli7xmaaqvzeohq@public.gmane.org \
    --cc=arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
    /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).