From: swarren@wwwdotorg.org (Stephen Warren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] ARM: boot/dts/Makefile: drop '\'
Date: Wed, 10 Apr 2013 11:35:34 -0600 [thread overview]
Message-ID: <5165A2E6.7010108@wwwdotorg.org> (raw)
In-Reply-To: <1365585444-11520-1-git-send-email-plagnioj@jcrosoft.com>
On 04/10/2013 03:17 AM, Jean-Christophe PLAGNIOL-VILLARD wrote:
> when adding multiple new platform this generate comflict
"When" and "conflict".
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> -ifeq ($(CONFIG_OF),y)
> -targets += dtbs
> -targets += $(dtb-y)
> -endif
> -
> -# *.dtb used to be generated in the directory above. Clean out the
> -# old build results so people don't accidentally use them.
> -dtbs: $(addprefix $(obj)/, $(dtb-y))
> - $(Q)rm -f $(obj)/../*.dtb
> -
> -clean-files := *.dtb
I'm not sure why those parts show up in the diff. I guess the -/+ lines
look the same though, so the result is fine. did line-endings change or
something?
next prev parent reply other threads:[~2013-04-10 17:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-10 9:17 [PATCH 1/2] ARM: boot/dts/Makefile: drop '\' Jean-Christophe PLAGNIOL-VILLARD
2013-04-10 9:17 ` [PATCH 2/2] ARM: at91: move dts to subdir Jean-Christophe PLAGNIOL-VILLARD
2013-04-10 17:39 ` Stephen Warren
2013-04-10 17:44 ` Jean-Christophe PLAGNIOL-VILLARD
2013-04-10 17:47 ` Olof Johansson
2013-04-10 17:35 ` Stephen Warren [this message]
2013-04-10 17:48 ` [PATCH 1/2] ARM: boot/dts/Makefile: drop '\' 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=5165A2E6.7010108@wwwdotorg.org \
--to=swarren@wwwdotorg.org \
--cc=linux-arm-kernel@lists.infradead.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 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.