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]

Date:   Tue, 7 Feb 2017 09:07:43 +0100
From:   Geert Uytterhoeven <geert@...ux-m68k.org>
To:     Ingo Molnar <mingo@...nel.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>

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.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@...ux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds