diff mbox

incorrect conflict fix on renesas-devel-20131003?

Message ID 20131004120837.f9a42f7dce84c1f14f92b8a2@ops.dti.ne.jp
State Rejected
Headers show

Commit Message

takasi-y@ops.dti.ne.jp Oct. 4, 2013, 3:08 a.m. UTC
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

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,
/yoshii
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Simon Horman Oct. 4, 2013, 4:09 a.m. UTC | #1
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Simon Horman Oct. 4, 2013, 8:40 a.m. UTC | #2
On Fri, Oct 04, 2013 at 01:09:38PM +0900, Simon Horman wrote:
> 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.

Thanks once again for pointing this out.
It should be fixed in renesas-devel-20131004 which I pushed a few minutes ago.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- 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 \