lkml.org 
[lkml]   [2022]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] x86/core for 5.18

* 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

\
 
 \ /
  Last update: 2022-03-27 20:56    [W:0.039 / U:0.188 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site