From: Ingo Molnar <mingo@kernel.org>
To: Borislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>, x86-ml <x86@kernel.org>,
lkml <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] x86/entry for 5.8
Date: Sun, 28 Jun 2020 20:02:24 +0200 [thread overview]
Message-ID: <20200628180224.GA19572@gmail.com> (raw)
In-Reply-To: <20200628171816.GF18884@zn.tnic>
* 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
next prev parent reply other threads:[~2020-06-28 18:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-28 14:05 [GIT PULL] x86/entry for 5.8 Borislav Petkov
2020-06-28 16:57 ` Linus Torvalds
2020-06-28 17:18 ` Borislav Petkov
2020-06-28 18:02 ` Ingo Molnar [this message]
2020-06-28 18:45 ` pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200628180224.GA19572@gmail.com \
--to=mingo@kernel.org \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.