public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
	linux-kernel@vger.kernel.org
Cc: owen.smith@citrix.com, jaxboe@fusionio.com,
	Ian.Campbell@eu.citrix.com, tony.luck@intel.com,
	drjones@redhat.com
Subject: [GIT PULL] (xen) stable/ia64, stable/blkfront-cleanup, and stable/cleanup for 2.6.39
Date: Mon, 14 Mar 2011 23:51:29 -0400	[thread overview]
Message-ID: <20110315035129.GC820@dumpdata.com> (raw)

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


                 reply	other threads:[~2011-03-15  3:51 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=20110315035129.GC820@dumpdata.com \
    --to=konrad.wilk@oracle.com \
    --cc=Ian.Campbell@eu.citrix.com \
    --cc=drjones@redhat.com \
    --cc=jaxboe@fusionio.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=owen.smith@citrix.com \
    --cc=tony.luck@intel.com \
    --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