lkml.org 
[lkml]   [2020]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] x86/entry for 5.8

* Borislav Petkov <bp@suse.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

\
 
 \ /
  Last update: 2020-06-28 20:02    [W:0.047 / U:0.532 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site