linux-kernel - Re: [GIT PULL] x86/core for 5.18

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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <YkCzCrfMY/HavlLm@gmail.com>
Date:   Sun, 27 Mar 2022 20:55:06 +0200
From:   Ingo Molnar <mingo@...nel.org>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     Peter Zijlstra <peterz@...radead.org>,
        the arch/x86 maintainers <x86@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Alexei Starovoitov <alexei.starovoitov@...il.com>,
        Christophe Leroy <christophe.leroy@...roup.eu>
Subject: Re: [GIT PULL] x86/core for 5.18


* Linus Torvalds <torvalds@...ux-foundation.org> wrote:

> On Sun, Mar 27, 2022 at 1:22 AM Peter Zijlstra <peterz@...radead.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