From: Ingo Molnar <mingo@elte.hu>
To: Borislav Petkov <bp@alien8.de>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [GIT PULL, v2] x86/cpu changes for v2.6.35
Date: Tue, 18 May 2010 08:33:50 +0200 [thread overview]
Message-ID: <20100518063350.GB26223@elte.hu> (raw)
In-Reply-To: <20100518061512.GA17740@liondog.tnic>
* 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
next prev parent reply other threads:[~2010-05-18 6:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-17 22:52 [GIT PULL] " Ingo Molnar
2010-05-17 22:54 ` [GIT PULL, v2] " Ingo Molnar
2010-05-18 6:15 ` Borislav Petkov
2010-05-18 6:33 ` Ingo Molnar [this message]
2010-05-18 8:21 ` Jaswinder Singh Rajput
2010-05-18 8:26 ` Jaswinder Singh Rajput
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=20100518063350.GB26223@elte.hu \
--to=mingo@elte.hu \
--cc=akpm@linux-foundation.org \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®