From: Simon Horman <horms@verge.net.au>
To: linux-sh@vger.kernel.org
Subject: Re: incorrect conflict fix on renesas-devel-20131003?
Date: Fri, 04 Oct 2013 04:09:38 +0000 [thread overview]
Message-ID: <20131004040938.GA19926@verge.net.au> (raw)
In-Reply-To: <20131004120837.f9a42f7dce84c1f14f92b8a2@ops.dti.ne.jp>
On Fri, Oct 04, 2013 at 12:08:37PM +0900, takasi-y@ops.dti.ne.jp wrote:
> Hi simon,
>
> On the tree at tag:renesas-devel-20131003,
> I found the first hunk of
> a4fcd4f (refs/remotes/renesas/dt3) ARM: shmobile: Remove KDM9D reference DTS
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -195,7 +195,6 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
> ste-ccu9540.dtb
> dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
> dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
> - emev2-kzm9d-reference.dtb \
> r8a7740-armadillo800eva.dtb \
> r8a7778-bockw.dtb \
> r8a7778-bockw-reference.dtb \
>
> is (accidentaly, I think) reverted in the
> commit 65bf40ead9e97125644dd6601b518bfd8e13b95c
> Merge: 11ef961 a4fcd4f
> Author: Simon Horman <horms+renesas@verge.net.au>
> Date: Thu Oct 3 15:20:36 2013 +0900
>
> Merge branch 'heads/dt3' into devel
>
> Conflicts:
> arch/arm/boot/dts/Makefile
>
> This reslts in a compilation error
> | make[1]: *** No rule to make target `arch/arm/boot/dts/emev2-kzm9d-reference.dtb', needed by `dtbs'. Stop.
> | make: *** [dtbs] Error 2
> if the .dtb has been removed.
Thanks, I will fix that.
next prev parent reply other threads:[~2013-10-04 4:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-04 3:08 incorrect conflict fix on renesas-devel-20131003? takasi-y
2013-10-04 4:09 ` Simon Horman [this message]
2013-10-04 8:40 ` Simon Horman
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=20131004040938.GA19926@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-sh@vger.kernel.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.