From: Chris Ball <cjb@laptop.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Stephen Warren <swarren@wwwdotorg.org>,
Viresh Kumar <viresh.kumar@st.com>,
patches@linaro.org, devicetree-discuss@lists.ozlabs.org,
linux-mmc@vger.kernel.org, rob.herring@calxeda.com,
Anton Vorontsov <anton.vorontsov@linaro.org>,
linux-samsung-soc@vger.kernel.org, ben-linux@fluff.org,
kgene.kim@samsung.com, Lee Jones <lee.jones@linaro.org>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2] mmc: dt: Consolidate DT bindings
Date: Sun, 13 May 2012 16:10:43 -0400 [thread overview]
Message-ID: <87pqa7suyk.fsf@laptop.org> (raw)
In-Reply-To: <201205131946.33109.arnd@arndb.de> (Arnd Bergmann's message of "Sun, 13 May 2012 19:46:32 +0000")
Hi Arnd,
On Sun, May 13 2012, Arnd Bergmann wrote:
> I've verified that there are no conflicts with anything we have in
> arm-soc right now, so I think it should just go through your
> tree.
Ah, I based the patch on latest linux-next. That's why there aren't
conflicts against arm-soc, but there are conflicts (in the omap and
tegra dts changes) between the patch and Linus master/mmc-next:
Applying: mmc: dt: Consolidate DT bindings
error: patch failed: arch/arm/boot/dts/omap3-beagle.dts:57
error: patch failed: arch/arm/boot/dts/omap4-panda.dts:55
error: patch failed: arch/arm/boot/dts/omap4-sdp.dts:94
error: patch failed: arch/arm/boot/dts/tegra-cardhu.dts:141
error: patch failed: arch/arm/boot/dts/tegra-harmony.dts:335
error: patch failed: arch/arm/boot/dts/tegra-ventana.dts:338
Patch failed at 0001 mmc: dt: Consolidate DT bindings
So I think merging via arm-soc is the only way to get it to Linus
without conflicts. (Alternatively I can take it in mmc-next and
Linus can handle the conflicts.)
Thanks!
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
WARNING: multiple messages have this Message-ID (diff)
From: cjb@laptop.org (Chris Ball)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] mmc: dt: Consolidate DT bindings
Date: Sun, 13 May 2012 16:10:43 -0400 [thread overview]
Message-ID: <87pqa7suyk.fsf@laptop.org> (raw)
In-Reply-To: <201205131946.33109.arnd@arndb.de> (Arnd Bergmann's message of "Sun, 13 May 2012 19:46:32 +0000")
Hi Arnd,
On Sun, May 13 2012, Arnd Bergmann wrote:
> I've verified that there are no conflicts with anything we have in
> arm-soc right now, so I think it should just go through your
> tree.
Ah, I based the patch on latest linux-next. That's why there aren't
conflicts against arm-soc, but there are conflicts (in the omap and
tegra dts changes) between the patch and Linus master/mmc-next:
Applying: mmc: dt: Consolidate DT bindings
error: patch failed: arch/arm/boot/dts/omap3-beagle.dts:57
error: patch failed: arch/arm/boot/dts/omap4-panda.dts:55
error: patch failed: arch/arm/boot/dts/omap4-sdp.dts:94
error: patch failed: arch/arm/boot/dts/tegra-cardhu.dts:141
error: patch failed: arch/arm/boot/dts/tegra-harmony.dts:335
error: patch failed: arch/arm/boot/dts/tegra-ventana.dts:338
Patch failed at 0001 mmc: dt: Consolidate DT bindings
So I think merging via arm-soc is the only way to get it to Linus
without conflicts. (Alternatively I can take it in mmc-next and
Linus can handle the conflicts.)
Thanks!
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
next prev parent reply other threads:[~2012-05-13 20:10 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-31 17:56 [PATCH v3 0/6] mmc: sdhci-s3c: Rework platform data and add device tree support Thomas Abraham
2012-01-31 17:56 ` Thomas Abraham
2012-01-31 17:56 ` [PATCH v3 1/6] mmc: sdhci-s3c: Remove usage of clk_type member in platform data Thomas Abraham
2012-01-31 17:56 ` Thomas Abraham
2012-01-31 17:56 ` [PATCH v3 2/6] arm: exynos4: use 'exynos4-sdhci' as device name for sdhci controllers Thomas Abraham
2012-01-31 17:56 ` Thomas Abraham
2012-01-31 17:56 ` [PATCH v3 3/6] arm: samsung: remove all uses of clk_type member in sdhci platform data Thomas Abraham
2012-01-31 17:56 ` Thomas Abraham
2012-01-31 17:56 ` [PATCH v3 4/6] mmc: sdhci-s3c: derive transfer width host capability from max_width in " Thomas Abraham
2012-01-31 17:56 ` Thomas Abraham
2012-01-31 19:12 ` Sergei Shtylyov
2012-01-31 19:12 ` Sergei Shtylyov
2012-01-31 17:56 ` [PATCH v3 5/6] mmc: sdhci-s3c: Keep a copy of platform data and use it Thomas Abraham
2012-01-31 17:56 ` Thomas Abraham
2012-01-31 17:56 ` [PATCH v3 6/6] mmc: sdhci-s3c: Add device tree support Thomas Abraham
2012-01-31 17:56 ` Thomas Abraham
2012-01-31 20:08 ` Grant Likely
2012-01-31 20:08 ` Grant Likely
2012-02-01 18:21 ` Karol Lewandowski
2012-02-01 18:21 ` Karol Lewandowski
2012-03-27 16:15 ` Arnd Bergmann
2012-03-27 16:15 ` Arnd Bergmann
2012-03-27 16:19 ` Arnd Bergmann
2012-03-27 16:19 ` Arnd Bergmann
2012-03-30 6:33 ` Viresh Kumar
2012-03-30 6:33 ` Viresh Kumar
2012-03-30 11:36 ` Arnd Bergmann
2012-03-30 11:36 ` Arnd Bergmann
2012-03-30 15:48 ` Stephen Warren
2012-03-30 15:48 ` Stephen Warren
2012-03-30 18:45 ` Arnd Bergmann
2012-03-30 18:45 ` Arnd Bergmann
[not found] ` <201203301845.07534.arnd-r2nGTMty4D4@public.gmane.org>
2012-04-01 11:29 ` Mark Brown
2012-04-01 11:29 ` Mark Brown
2012-05-13 4:14 ` [PATCH v2] mmc: dt: Consolidate DT bindings Chris Ball
2012-05-13 4:14 ` Chris Ball
2012-05-13 19:29 ` Guennadi Liakhovetski
2012-05-13 19:29 ` Guennadi Liakhovetski
[not found] ` <871umou38f.fsf_-_-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org>
2012-05-13 19:46 ` Arnd Bergmann
2012-05-13 19:46 ` Arnd Bergmann
2012-05-13 20:10 ` Chris Ball [this message]
2012-05-13 20:10 ` Chris Ball
2012-05-14 19:53 ` Arnd Bergmann
2012-05-14 19:53 ` Arnd Bergmann
2012-04-09 14:48 ` [PATCH v3 6/6] mmc: sdhci-s3c: Add device tree support Chris Ball
2012-04-09 14:48 ` Chris Ball
2012-04-10 21:37 ` Chris Ball
2012-04-10 21:37 ` Chris Ball
2012-02-09 13:42 ` [PATCH v3 0/6] mmc: sdhci-s3c: Rework platform data and add " Kukjin Kim
2012-02-09 13:42 ` Kukjin Kim
2012-02-11 21:37 ` Chris Ball
2012-02-11 21:37 ` Chris Ball
2012-02-16 13:04 ` Kukjin Kim
2012-02-16 13:04 ` Kukjin Kim
2012-02-16 13:08 ` Chris Ball
2012-02-16 13:08 ` Chris Ball
2012-02-21 11:37 ` Kukjin Kim
2012-02-21 11:37 ` Kukjin Kim
2012-02-21 13:17 ` Chris Ball
2012-02-21 13:17 ` Chris Ball
2012-02-22 12:58 ` Mark Brown
2012-02-22 12:58 ` Mark Brown
2012-03-02 20:40 ` Chris Ball
2012-03-02 20:40 ` Chris Ball
2012-03-03 0:44 ` Kukjin Kim
2012-03-03 0:44 ` Kukjin Kim
2012-03-03 0:46 ` [PATCH 1/2] mmc: sdhci-s3c: Use CONFIG_PM_SLEEP to ifdef system suspend Mark Brown
2012-03-03 0:46 ` Mark Brown
2012-03-03 0:46 ` [PATCH 2/2] mmc: sdhci-s3c: Enable runtime power management Mark Brown
2012-03-03 0:46 ` Mark Brown
2012-03-05 10:48 ` Jaehoon Chung
2012-03-05 10:48 ` Jaehoon Chung
2012-03-05 11:52 ` Mark Brown
2012-03-05 11:52 ` Mark Brown
2012-03-06 6:40 ` Jaehoon Chung
2012-03-06 6:40 ` Jaehoon Chung
2012-03-09 4:57 ` Chris Ball
2012-03-09 4:57 ` Chris Ball
2012-03-09 5:08 ` Chris Ball
2012-03-09 5:08 ` Chris Ball
2012-03-09 12:26 ` Mark Brown
2012-03-09 12:26 ` Mark Brown
2012-03-05 10:24 ` [PATCH 1/2] mmc: sdhci-s3c: Use CONFIG_PM_SLEEP to ifdef system suspend Jaehoon Chung
2012-03-05 10:24 ` Jaehoon Chung
2012-03-09 4:56 ` Chris Ball
2012-03-09 4:56 ` Chris Ball
2012-03-27 15:50 ` [PATCH v3 0/6] mmc: sdhci-s3c: Rework platform data and add device tree support Chris Ball
2012-03-27 15:50 ` Chris Ball
2012-03-28 9:54 ` Mark Brown
2012-03-28 9:54 ` Mark Brown
2012-03-29 3:15 ` Kukjin Kim
2012-03-29 3:15 ` Kukjin Kim
2012-04-01 1:12 ` Chris Ball
2012-04-01 1:12 ` Chris Ball
2012-04-02 19:08 ` Kukjin Kim
2012-04-02 19:08 ` Kukjin Kim
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=87pqa7suyk.fsf@laptop.org \
--to=cjb@laptop.org \
--cc=anton.vorontsov@linaro.org \
--cc=arnd@arndb.de \
--cc=ben-linux@fluff.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=kgene.kim@samsung.com \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=patches@linaro.org \
--cc=rob.herring@calxeda.com \
--cc=swarren@wwwdotorg.org \
--cc=viresh.kumar@st.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.