Re: [PATCH] ARM: EXYNOS4: Fix the merge conflict
From: Linus Torvalds
Date: Sat Nov 05 2011 - 12:29:33 EST
On Fri, Nov 4, 2011 at 7:08 PM, Kukjin Kim <kgene.kim@xxxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/