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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <7v7h3c30j7.fsf@alter.siamese.dyndns.org>
Date:	Sun, 06 Nov 2011 22:32:44 -0800
From:	Junio C Hamano <gitster@...ox.com>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Kukjin Kim <kgene.kim@...sung.com>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] ARM: EXYNOS4: Fix the merge conflict

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

> On Fri, Nov 4, 2011 at 7:08 PM, Kukjin Kim <kgene.kim@...sung.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.

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