From: Ingo Molnar <mingo@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
the arch/x86 maintainers <x86@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Alexei Starovoitov <alexei.starovoitov@gmail.com>,
Christophe Leroy <christophe.leroy@csgroup.eu>
Subject: Re: [GIT PULL] x86/core for 5.18
Date: Sun, 27 Mar 2022 20:55:06 +0200 [thread overview]
Message-ID: <YkCzCrfMY/HavlLm@gmail.com> (raw)
In-Reply-To: <CAHk-=whzW56xChey=k+9KeK_NFxWLfZrt5UWvVjTxYbHLP1Nwg@mail.gmail.com>
* Linus Torvalds <torvalds@linux-foundation.org> wrote:
> On Sun, Mar 27, 2022 at 1:22 AM Peter Zijlstra <peterz@infradead.org> wrote:
> >
> > Duh! I pushed the tag to the wrong repo (peterz/queue.git)... I just
> > pushed it out to tip/tip/git as well, so hopefully it should all work
> > now.
>
> Thanks, looks good.
>
> There's a few merges that don't have good explanations ("avoid conflicts"
> really is not an explanation on its own), but those weren't actually
> yours.
Ok, these were probably mine:
9cea0d46f52f Merge branch 'x86/cpu' into x86/core, to resolve conflicts
8c490b42fe91 Merge branch 'x86/pasid' into x86/core, to resolve conflicts
Will add more verbose conflict merge explanations going forward.
Thanks,
Ingo
next prev parent reply other threads:[~2022-03-27 18:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-26 15:26 [GIT PULL] x86/core for 5.18 Peter Zijlstra
2022-03-26 21:53 ` Linus Torvalds
2022-03-27 8:22 ` Peter Zijlstra
2022-03-27 17:47 ` Linus Torvalds
2022-03-27 18:55 ` Ingo Molnar [this message]
2022-03-27 17:36 ` 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=YkCzCrfMY/HavlLm@gmail.com \
--to=mingo@kernel.org \
--cc=alexei.starovoitov@gmail.com \
--cc=christophe.leroy@csgroup.eu \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox