From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org
Cc: olaf@aepfle.de, ruslan@rpisarev.org.ua
Subject: [GIT PULL] (xen) stable/cleanups-3.2 for Linux 3.2-rc0
Date: Mon, 24 Oct 2011 08:56:20 -0400 [thread overview]
Message-ID: <20111024125620.GC19100@phenom.dumpdata.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1543 bytes --]
Hey Linus,
Please pull the following branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen stable/cleanups-3.2
which has some exciting merge conflict patches. These patches are based on
git commit 8ded371 (Merge branch 'for-3.1/drivers' of git://git.kernel.dk/linux-block).
They are patches mostly created from running scripts/checkpatch.pl and fixing things up.
They also cause merge conflicts: git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen linux-next
has the resolution of that - but it should be fairly easy to fix it up.
Please pull!
Olaf Hering (1):
xen: use static initializers in xen-balloon.c
Ruslan Pisarev (6):
Xen: fix whitespaces,tabs coding style issue in drivers/xen/balloon.c
Xen: fix whitespaces,tabs coding style issue in drivers/xen/events.c
Xen: fix braces coding style issue in gntdev.c and grant-table.c
Xen: fix whitespaces,tabs coding style issue in drivers/xen/pci.c
Xen: fix braces coding style issue in xenbus_probe.h
Xen: fix braces and tabs coding style issue in xenbus_probe.c
drivers/xen/balloon.c | 15 +++++++--------
drivers/xen/events.c | 9 ++++-----
drivers/xen/gntdev.c | 3 +--
drivers/xen/grant-table.c | 2 +-
drivers/xen/pci.c | 4 ++--
drivers/xen/xen-balloon.c | 17 ++++++++---------
drivers/xen/xenbus/xenbus_probe.c | 7 +++----
drivers/xen/xenbus/xenbus_probe.h | 3 +--
8 files changed, 27 insertions(+), 33 deletions(-)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
reply other threads:[~2011-10-24 13:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20111024125620.GC19100@phenom.dumpdata.com \
--to=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=olaf@aepfle.de \
--cc=ruslan@rpisarev.org.ua \
--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;
as well as URLs for NNTP newsgroup(s).