linux-kernel - Re: [GIT PULL] x86/entry for 5.8

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: <20200628180224.GA19572@gmail.com>
Date:   Sun, 28 Jun 2020 20:02:24 +0200
From:   Ingo Molnar <mingo@...nel.org>
To:     Borislav Petkov <bp@...e.de>
Cc:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Peter Zijlstra <peterz@...radead.org>, x86-ml <x86@...nel.org>,
        lkml <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] x86/entry for 5.8


* Borislav Petkov <bp@...e.de> wrote:

> On Sun, Jun 28, 2020 at 09:57:00AM -0700, Linus Torvalds wrote:
> > Tssk. This has an unnecessary merge "to resolve conflicts". I'd much
> > rather have seen the pull without that.
> 
> Yeah, reportedly because "Linus renamed probe_kernel_read() and [peterz]
> removed a call". I guess they did that for linux-next's sake.

Yeah, I did the 2c92d787cc9f merge to have a clean integration - but 
if the merge resolution is the tail commit of a branch, then I usually 
strip it just before sending it to Linus, and let Linus resolve it 
instead - a branch with a tail conflict merge commit is arguably ugly.

> > Oh well. Pulled.
> 
> Thx.

Thanks guys!

	Ingo