* [GIT PULL] (xen) stable/cleanups-3.2 for Linux 3.2-rc0
@ 2011-10-24 12:56 Konrad Rzeszutek Wilk
0 siblings, 0 replies; only message in thread
From: Konrad Rzeszutek Wilk @ 2011-10-24 12:56 UTC (permalink / raw)
To: torvalds, linux-kernel; +Cc: olaf, ruslan
[-- 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 --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-10-24 13:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-24 12:56 [GIT PULL] (xen) stable/cleanups-3.2 for Linux 3.2-rc0 Konrad Rzeszutek Wilk
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.