linux-kernel - Re: [PATCH] ARM: EXYNOS4: Fix the merge conflict

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CA+55aFw8mxcwukXWe-DRYYv3tWmM6gRebgAGxAMpDLbqhqK2-Q@mail.gmail.com>
Date:	Sat, 5 Nov 2011 09:29:08 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Kukjin Kim <kgene.kim@...sung.com>
Cc:	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] ARM: EXYNOS4: Fix the merge conflict

On Fri, Nov 4, 2011 at 7:08 PM, Kukjin Kim <kgene.kim@...sung.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/