LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: "Liu, Jinsong" <jinsong.liu@intel.com>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>
Subject: Re: linux-next: build failure after merge of the xen-two tree
Date: Wed, 20 Feb 2013 15:49:41 -0500	[thread overview]
Message-ID: <20130220204941.GC4526@phenom.dumpdata.com> (raw)
In-Reply-To: <4696812.SKkpQQd9iW@vostro.rjw.lan>

> > > commit 3757b94802fb65d8f696597a74053cf21738da0b
> > > Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > > Date:   Wed Feb 13 14:36:47 2013 +0100
> > > 
> > >     ACPI / hotplug: Fix concurrency issues and memory leaks
> > > 
> > > after which acpi_bus_scan() and acpi_bus_trim() have to be run under
> > > acpi_scan_lock (new in my tree as well).
> > 
> > Yes, we noticed that and only need minor updates at xen side, will send out
> > 2 xen patches later accordingly, for cleanup and adding lock.
> 
> Thanks, but those new changes will only make sense after merging the Xen tree
> with the PM tree.  Why don't we queue them up for merging later after both
> the Xen and PM trees have been pulled from?

OK, I've created a branch (http://git.kernel.org/?p=linux/kernel/git/konrad/xen.git;a=shortlog;h=refs/heads/linux-next-resolved)
that has your branch and my branch - along with the fix from Stephan and then
the three updates from Jinsong. Jinsong, please check that I've got all the
right patches. I will rebase it once Linus has merged both of the Xen and PM trees.

  reply	other threads:[~2013-02-20 20:50 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-15  4:45 Stephen Rothwell
2013-02-15 13:26 ` Konrad Rzeszutek Wilk
2013-02-15 13:50   ` Stephen Rothwell
2013-02-15 14:53     ` Rafael J. Wysocki
2013-02-15 14:52       ` Stephen Rothwell
2013-02-15 17:46         ` Liu, Jinsong
2013-02-16 20:11         ` Rafael J. Wysocki
2013-02-17  7:31           ` Liu, Jinsong
2013-02-17 14:08             ` Rafael J. Wysocki
2013-02-20 20:49               ` Konrad Rzeszutek Wilk [this message]
2013-02-20 21:24                 ` Rafael J. Wysocki
2013-02-21  6:40                 ` Liu, Jinsong
2013-02-15 17:20   ` Liu, Jinsong
2013-02-15 17:08 ` Liu, Jinsong
  -- strict thread matches above, loose matches on Subject: below --
2013-02-04  4:14 Stephen Rothwell
2013-02-05 18:30 ` Konrad Rzeszutek Wilk
2013-03-02 15:39   ` Stephen Rothwell
2012-10-02  4:33 Stephen Rothwell
2011-02-10  4:46 Stephen Rothwell
2011-02-10 12:24 ` Thomas Gleixner
2011-02-10 15:22   ` Konrad Rzeszutek Wilk

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=20130220204941.GC4526@phenom.dumpdata.com \
    --to=konrad.wilk@oracle.com \
    --cc=jinsong.liu@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rjw@sisk.pl \
    --cc=sfr@canb.auug.org.au \
    --cc=xen-devel@lists.xensource.com \
    --subject='Re: linux-next: build failure after merge of the xen-two tree' \
    /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

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).