lkml.org 
[lkml]   [2010]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL, v2] x86/cpu changes for v2.6.35

* Borislav Petkov <bp@alien8.de> wrote:

> From: Ingo Molnar <mingo@elte.hu>
> Date: Tue, May 18, 2010 at 12:54:26AM +0200
>
> Hi Ingo,
>
> > * Ingo Molnar <mingo@elte.hu> wrote:
>
> [..]
>
> > x86, k8: Fix build error when K8_NB is disabled
>
> [..]
>
> > x86, cacheinfo: Turn off L3 cache index disable feature in virtualized environments
>
> [..]
>
> > powernow-k8: Fix frequency reporting
>
> those three are already in Linus' tree since they were
> urgent fixes and had to be sent ASAP. [...]

Yeah, hpa mentioned it last week in his pull request that
those fixes were picked out of the stream of pending
development commits.

> [...] Now I don't know whether git will skip them when
> merging or will cause unneeded merge conflicts (a small
> superficial test I did here caused merge conflicts) ...
> anyways, just a heads-up.

In this particular case there will be a conflict in
arch/x86/kernel/cpu/intel_cacheinfo.c when Linus pulls,
and the correct resolution is to pick the version from
x86/cpu.

Thanks for mentioning this!

Ingo


\
 
 \ /
  Last update: 2010-05-18 08:37    [W:0.051 / U:0.064 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site