From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44439) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SvUMP-0005BO-P3 for qemu-devel@nongnu.org; Sun, 29 Jul 2012 10:20:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SvUMO-0004sc-4s for qemu-devel@nongnu.org; Sun, 29 Jul 2012 10:20:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65113) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SvUMN-0004s6-Rl for qemu-devel@nongnu.org; Sun, 29 Jul 2012 10:20:44 -0400 Date: Sun, 29 Jul 2012 17:21:14 +0300 From: "Michael S. Tsirkin" Message-ID: <20120729142114.GB14278@redhat.com> References: <20120719151533.GA15648@redhat.com> <500D7755.90407@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <500D7755.90407@suse.de> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL] pci,msi,virtio List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andreas =?iso-8859-1?Q?F=E4rber?= Cc: aik@ozlabs.ru, jan.kiszka@siemens.com, alex.williamson@redhat.com, qemu-devel@nongnu.org, Anthony Liguori On Mon, Jul 23, 2012 at 06:09:57PM +0200, Andreas F=E4rber wrote: > Am 19.07.2012 17:15, schrieb Michael S. Tsirkin: > > The following changes since commit 80aa796bf38b7ef21daa42673b4711510c= 450d8a: > >=20 > > pci_bridge_dev: fix error path in pci_bridge_dev_initfn() (2012-06-= 11 22:55:13 +0300) > >=20 > > are available in the git repository at: > >=20 > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony > >=20 > > for you to fetch changes up to 932d4a42afa28829fadf3cbfbb0507cc09aafd= 8b: > >=20 > > msi/msix: added API to set MSI message address and data (2012-07-19= 17:56:42 +0300) > >=20 > > ---------------------------------------------------------------- > > pci,msi,virtio > >=20 > > This pull includes preparation patches mostly by Jan and Alex > > that should help merge device assignment down the road. > > And there's a new API needed for emulating POWER firmware. > >=20 > > So no new functionality and some unused APIs but it looks like > > merging will help people make progress. > >=20 > > Signed-off-by: Michael S. Tsirkin >=20 > Usually, PULLs are expected to carry the individual patches as replies. >=20 > But more important, did something go wrong with rebasing before sending > out the PULL? June 11 is more than a month ago. And if I try to rebase > my pci_host branch on your "pci" branch it tries to replay loads of > really old post-1.1 commits (e.g., my "Pass PowerPCCPU to...") and > fails... am I doing something wrong? "for_anthony" tag and "pci" branch > seem to match in date at least. >=20 > Regards, > Andreas I am guessing you mixed up upstream and onto options for git rebase, happens to me a lot. Should be something like git rebase --onto pci origin/master > --=20 > SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany > GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrn= berg >=20