Messages in this thread | | | Date | Thu, 11 Dec 2014 13:25:58 +0100 | From | Ingo Molnar <> | Subject | Re: [GIT PULL, v2] x86/microcode tree changes for v3.19 |
| |
* Borislav Petkov <bp@alien8.de> wrote:
> On Thu, Dec 11, 2014 at 07:25:08AM +0100, Ingo Molnar wrote: > > > Hmm. There's a conflict with commit 02ecc41abcea ("x86, > > > microcode: Limit the microcode reloading to 64-bit for now"), > > > > Sorry, should have mentioned that explicitly, but forgot about > > it. > > > > > but I'm going to assume that the issue is fixed now, and that > > > commit fbae4ba8c4a3 ("x86, microcode: Reload microcode on > > > resume") that causes the conflict also handles the 32-bit case > > > correctly. So my merge is going to just remove the X86_64 test, > > > effectively undoing that first commit, ratehr than keep it > > > around. > > Yes, this is the intended outcome.
Ok, great!
Thanks,
Ingo
| |