From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: consider tidying up the xen-two tree
Date: Mon, 4 Mar 2013 08:56:21 -0500 [thread overview]
Message-ID: <20130304135621.GB13229@phenom.dumpdata.com> (raw)
In-Reply-To: <20130304104605.7878c0c7f3d0ba795c9e7384@canb.auug.org.au>
On Mon, Mar 04, 2013 at 10:46:05AM +1100, Stephen Rothwell wrote:
> Hi Konrad,
>
> We are at the end of the merge window and the xen-two tree still looks
> like this:
>
> arch/x86/include/asm/xen/interface.h | 11 ++-
> arch/x86/include/asm/xen/page.h | 3 +
> arch/x86/pci/xen.c | 9 ++
> arch/x86/xen/Kconfig | 8 ++
> arch/x86/xen/enlighten.c | 76 ++++++++++++-----
> arch/x86/xen/irq.c | 5 +-
> arch/x86/xen/mmu.c | 159 ++++++++++++++++++++++++++++++++---
> arch/x86/xen/mmu.h | 2 +
> arch/x86/xen/p2m.c | 2 +-
> arch/x86/xen/setup.c | 59 ++++++++++---
> arch/x86/xen/smp.c | 39 ++++++---
> arch/x86/xen/xen-head.S | 10 ++-
> drivers/net/xen-netback/netback.c | 11 ++-
> drivers/xen/balloon.c | 14 +--
> drivers/xen/cpu_hotplug.c | 4 +-
> drivers/xen/events.c | 9 +-
> drivers/xen/gntdev.c | 3 +-
> drivers/xen/grant-table.c | 115 +++++++++++++------------
> drivers/xen/privcmd.c | 2 +-
> drivers/xen/xenbus/xenbus_client.c | 9 +-
> include/xen/grant_table.h | 12 ---
> 21 files changed, 422 insertions(+), 140 deletions(-)
>
> Some of this is from commits going back to December 2011. And there
> are several duplicate commits (with reversions of old versions) as well
> as many merges.
>
> I assume that what is left in there is now v3.10 material (or
> bug/regression fixes), so maybe you should take the opportunity and
Yup.
> rebase the whole lot onto v3.9-rc1 when that is released.
Will do. I didn't know that was an OK thing - thought I had to keep the
history behind (so no rebase).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
prev parent reply other threads:[~2013-03-04 13:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-03 23:46 linux-next: consider tidying up the xen-two tree Stephen Rothwell
2013-03-04 13:56 ` Konrad Rzeszutek Wilk [this message]
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=20130304135621.GB13229@phenom.dumpdata.com \
--to=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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