linux-kernel - Re: [GIT PULL] GPIO bulk changes for kernel v4.6

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: <xmqqk2kzr9iw.fsf@gitster.mtv.corp.google.com>
Date:	Fri, 18 Mar 2016 10:16:55 -0700
From:	Junio C Hamano <gitster@...ox.com>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Johannes Schindelin <Johannes.Schindelin@....de>,
	Laxman Dewangan <ldewangan@...dia.com>,
	Linus Walleij <linus.walleij@...aro.org>,
	"linux-kernel\@vger.kernel.org" <linux-kernel@...r.kernel.org>,
	"linux-gpio\@vger.kernel.org" <linux-gpio@...r.kernel.org>,
	Git Mailing List <git@...r.kernel.org>
Subject: Re: [GIT PULL] GPIO bulk changes for kernel v4.6

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

> The code in the recursive merge that allows this to happen is this:
> ...
> And I do think that's right, and I think it's clever, and it goes back to 2006:
>
>   934d9a24078e merge-recur: if there is no common ancestor, fake empty one
>
> but I think there should be an option there.

Oh, I think everybody understands that and agrees by now.