linux-kernel - Re: [PATCH 57/89] sched/headers: Split <linux/sched/task

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170207081321.GA28595@gmail.com>
Date:   Tue, 7 Feb 2017 09:13:21 +0100
From:   Ingo Molnar <mingo@...nel.org>
To:     Geert Uytterhoeven <geert@...ux-m68k.org>
Cc:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Mike Galbraith <efault@....de>,
        Oleg Nesterov <oleg@...hat.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Thomas Gleixner <tglx@...utronix.de>
Subject: Re: [PATCH 57/89] sched/headers: Split <linux/sched/task_stack> out
 of <linux/sched.h>


* Geert Uytterhoeven <geert@...ux-m68k.org> wrote:

> Hi Ingo,
> 
> On Mon, Feb 6, 2017 at 10:54 PM, Ingo Molnar <mingo@...nel.org> wrote:
> > Wondering why Git allowed me to be so stupid with those leftover merge markers.
> > Git usually doesn't even allow me to commit them so I have these tuned out as a
> > possibility. This was just a regular git rebase -i flow, to back-merge fixes and
> > reorder/squash patches - nothing fancy that I remember - only the occasional
> > --onto option. I'm using Git 2.7.4.
> 
> Git complains about the merge conflicts, and refuses to commit the result
> as long as you haven't resolved them, but it will happily commit everything
> you add using "git add -u", incl. merge markers.

Hm, it should really force that via 'git add -f' or such. The merge markers are 
_very_ infrequent as naturally occuring source code lines even on a per line basis 
- and especially the combination of them should be exceedingly unique.

I frequently use:

	git add $(git ls-files -m)

... to stage edits without comitting them, probably that workflow is what caused 
this bug.

Thanks,

	Ingo