[PATCH] ARM: EXYNOS4: Fix the merge conflict

[PATCH] ARM: EXYNOS4: Fix the merge conflict

[Kukjin Kim]

The mark of conflict should be removed.

This happened at the commit fba9569924e06da076cb2ad12474bbd82d69f54d
("Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma")

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---
 arch/arm/mach-exynos4/clock.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-exynos4/clock.c b/arch/arm/mach-exynos4/clock.c
index e21952d..a52024e 100644
--- a/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.c
@@ -1286,11 +1286,8 @@ void __init exynos4_register_clocks(void)
 	s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
 	s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
 
-<<<<<<< HEAD
 	register_syscore_ops(&exynos4_clock_syscore_ops);
-=======
 	s3c24xx_register_clock(&dummy_apb_pclk);
 
->>>>>>> 4598fc2c94b68740e0269db03c98a1e7ad5af773
 	s3c_pwmclk_init();
 }
-- 
1.7.1

Re: [PATCH] ARM: EXYNOS4: Fix the merge conflict

[Linus Torvalds]

On Fri, Nov 4, 2011 at 7:08 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> The mark of conflict should be removed.
>
> This happened at the commit fba9569924e06da076cb2ad12474bbd82d69f54d
> ("Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma")

Grr. I'm a moron. I had fixed the conflict above it, and for some
reason didn't notice the second conflict.

I *always* do a "git diff" to check my conflict resolution
after-the-fact before I add it, but obviously I skipped that step this
time.

Blush.

Thanks,

                Linus

Re: [PATCH] ARM: EXYNOS4: Fix the merge conflict

[Junio C Hamano]

Linus Torvalds <torvalds@linux-foundation.org> writes:

> On Fri, Nov 4, 2011 at 7:08 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
>> The mark of conflict should be removed.

Would the hooks/pre-commit.sample have helped? The "git diff --check" at
the last step would have caught this with modern versions of git.