lkml.org 
[lkml]   [2011]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subject[GIT PULL] (xen) stable/ia64, stable/blkfront-cleanup, and stable/cleanup for 2.6.39
Hey Linus,

Please pull these three branches:

git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/ia64 stable/blkfront-cleanup stable/cleanup

Or you take #for-2.6.39/cleanup which has these three merges (no conflicts) for your convience.

Back to the description.

#stable/irq.rework is based off v2.6.38-rc6 (f5412be599602124d2bdd49947b231dd77c0bf99)

.. fixes a build-time mess up on IA64 when using Xen there.

#stable/blkfront-cleanup is based off v2.6.38-rc1 (c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470)

.. and it shuffles a struct around for further work.

#stable/cleanup is based off v2.6.38-rc4 (100b33c8bd8a3235fd0b7948338d6cbb3db3c63d)

.. and it does a general cleanup of compile warnings.

arch/ia64/include/asm/xen/hypercall.h | 2 +-
arch/x86/xen/enlighten.c | 2 +-
arch/x86/xen/p2m.c | 6 +++---
drivers/block/xen-blkfront.c | 8 ++++----
drivers/xen/events.c | 2 +-
include/xen/interface/io/blkif.h | 16 +++++++++++-----
6 files changed, 21 insertions(+), 15 deletions(-)

Ian Campbell (4):
xen: events: mark cpu_evtchn_mask_p as __refdata
xen p2m: annotate variable which appears unused
xen: annotate functions which only call into __init at start of day
xen: ia64 build broken due to "xen: switch to new schedop hypercall by default."

Owen Smith (1):
xen: Union the blkif_request request specific fields



\
 
 \ /
  Last update: 2011-03-15 04:55    [W:0.227 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site