From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org
Cc: xen-devel@lists.xensource.com
Subject: [GIT PULL] (xen) stable/for-linus-3.4-tag-two (or three depending on your taste) for v3.4-rc0
Date: Sat, 24 Mar 2012 09:56:47 -0400 [thread overview]
Message-ID: <20120324135647.GA5923@phenom.dumpdata.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 2606 bytes --]
Hey Linus,
I mentioned in the first git pull I would be sending another one after the cpu frequency
tree was pulled and here it is:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-linus-3.4-tag-two
However, I might have messed up a bit. The reason for this delay was that one patch
("xen/cpufreq: Disable the cpu frequency scaling drivers from loading") in my tree depended on
("provide disable_cpufreq() function to disable the API.") which was in the cpufreq tree.
To not cause bisection issues (such as hitting on my patch without the dependency patch and
getting a compile failure), I cherry-picked that specific patch into my branch from the cpufreq
tree - and is part of the above mentioned tag.
So the problem is when I do the git pull against your latest, it doesn't apply the "provide .."
but I still see it in the git shortlog!? Is that OK?
If that is not OK, I've done the unthinkable and created another branch (and yet another tag),
which is based on your yesterday tree and is based off cf821923ba9aa0917165a12573bdd6dc0a354421.
With that the shortlog does not include the "provide.." patch (obviously since that is the
merge of the cpufreq tree).
So if you prefer to pull that one instead, please pull:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-linus-3.4-tag-three
Either way, the git diff looks exactly the same.
Igor Mammedov (1):
xen: initialize platform-pci even if xen_emul_unplug=never
Jan Beulich (1):
xen/tmem: cleanup
Konrad Rzeszutek Wilk (6):
provide disable_cpufreq() function to disable the API.
xen/cpufreq: Disable the cpu frequency scaling drivers from loading.
xen/acpi-processor: Do not depend on CPU frequency scaling drivers.
xen/acpi: Remove the WARN's as they just create noise.
xen/smp: Fix bringup bug in AP code.
xen/acpi: Fix Kconfig dependency on CPU_FREQ
Stefano Stabellini (1):
xen: support pirq_eoi_map
arch/x86/xen/setup.c | 2 ++
arch/x86/xen/smp.c | 6 ++++++
drivers/block/xen-blkfront.c | 3 +++
drivers/net/xen-netfront.c | 4 ++++
drivers/xen/Kconfig | 5 ++---
drivers/xen/events.c | 26 +++++++++++++++++++++++---
drivers/xen/platform-pci.c | 5 -----
drivers/xen/tmem.c | 21 ++++++++-------------
drivers/xen/xen-acpi-processor.c | 4 ++--
include/xen/interface/physdev.h | 21 +++++++++++++++++++++
include/xen/tmem.h | 6 +++++-
11 files changed, 76 insertions(+), 27 deletions(-)
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2012-03-24 14:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-24 13:56 Konrad Rzeszutek Wilk [this message]
2012-03-24 18:43 ` [GIT PULL] (xen) stable/for-linus-3.4-tag-two (or three depending on your taste) for v3.4-rc0 Linus Torvalds
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=20120324135647.GA5923@phenom.dumpdata.com \
--to=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=xen-devel@lists.xensource.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.