From: Avi Kivity <avi@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Avi Kivity <avi@qumranet.com>,
linux-next@vger.kernel.org, Sheng Yang <sheng@linux.intel.com>,
Amit Shah <amit.shah@redhat.com>,
Xiantao Zhang <xiantao.zhang@intel.com>
Subject: Re: linux-next: manual merge of the kvm tree
Date: Wed, 29 Oct 2008 11:55:52 +0200 [thread overview]
Message-ID: <49083328.1010400@redhat.com> (raw)
In-Reply-To: <20081029135807.110c8735.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Avi,
>
> Today's linux-next merge of the kvm tree got a conflict in
> include/linux/kvm_host.h virt/kvm/kvm_main.c between commit
> 5550af4df179e52753d3a43a788a113ad8cd95cd ("KVM: Fix guest shared
> interrupt with in-kernel irqchip") from Linus' tree and commit
> 89c6b6a1b5059efa255ec254c8ee6667bdf6b2a0 ("KVM: IRQ ACK notifier should
> be used with in-kernel irqchip") from the kvm tree.
>
> Just a context change. I fixed it up (taking the kvm tree's removal of
> the first argument of kvm_unregister_irq_ack_notifier).
>
I've done the same merge and pushed kvm.git, so this should disappear on
the next -next.
--
error compiling committee.c: too many arguments to function
next prev parent reply other threads:[~2008-10-29 9:56 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-29 2:58 linux-next: manual merge of the kvm tree Stephen Rothwell
2008-10-29 9:55 ` Avi Kivity [this message]
2008-10-29 10:35 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-06-12 2:57 Stephen Rothwell
2009-06-12 7:19 ` Avi Kivity
2009-01-02 0:44 Stephen Rothwell
2008-12-29 5:11 Stephen Rothwell
2008-12-22 3:52 Stephen Rothwell
2008-12-22 5:13 ` Benjamin Herrenschmidt
2008-12-22 21:39 ` Hollis Blanchard
2008-12-22 21:41 ` Benjamin Herrenschmidt
2008-12-22 22:03 ` Hollis Blanchard
2008-12-22 22:11 ` Benjamin Herrenschmidt
2008-12-22 22:29 ` Paul Mackerras
2008-12-22 22:44 ` Hollis Blanchard
2008-12-23 0:07 ` Paul Mackerras
2008-12-23 1:02 ` Hollis Blanchard
2008-12-23 1:38 ` Benjamin Herrenschmidt
2008-11-25 6:49 Stephen Rothwell
2008-10-15 5:27 Stephen Rothwell
2008-09-17 5:50 Stephen Rothwell
2008-09-17 5:24 Stephen Rothwell
2008-09-15 0:14 Stephen Rothwell
2008-09-15 6:53 ` Ingo Molnar
2008-09-12 19:50 Stephen Rothwell
2008-09-12 19:53 ` Arjan van de Ven
2008-09-12 19:59 ` Stephen Rothwell
2008-08-26 4:45 Stephen Rothwell
2008-08-26 7:39 ` Avi Kivity
2008-08-26 7:41 ` Stephen Rothwell
2008-08-15 4:46 Stephen Rothwell
2008-08-04 3:13 Stephen Rothwell
2008-07-22 3:43 Stephen Rothwell
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=49083328.1010400@redhat.com \
--to=avi@redhat.com \
--cc=amit.shah@redhat.com \
--cc=avi@qumranet.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=sheng@linux.intel.com \
--cc=xiantao.zhang@intel.com \
/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 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.