Re: [Qemu-devel] [PULL] pci,msi,virtio

[Andreas Färber]

Am 23.07.2012 18:39, schrieb Anthony Liguori:
> Andreas Färber <address@hidden> writes:
> 
>> Am 19.07.2012 17:15, schrieb Michael S. Tsirkin:
>>> The following changes since commit 80aa796bf38b7ef21daa42673b4711510c450d8a:
>>>
>>>   pci_bridge_dev: fix error path in pci_bridge_dev_initfn() (2012-06-11 
>>> 22:55:13 +0300)
>>>
>>> are available in the git repository at:
>>>
>>>   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony
>>>
>>> for you to fetch changes up to 932d4a42afa28829fadf3cbfbb0507cc09aafd8b:
>>>
>>>   msi/msix: added API to set MSI message address and data (2012-07-19 
>>> 17:56:42 +0300)
>>>
>>> ----------------------------------------------------------------
>>> pci,msi,virtio
>>>
>>> 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.
>>>
>>> So no new functionality and some unused APIs but it looks like
>>> merging will help people make progress.
>>>
>>> Signed-off-by: Michael S. Tsirkin <address@hidden>
>>
>> Usually, PULLs are expected to carry the individual patches as replies.
>>
>> 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.
> 
> 
> It's a tag, not a branch.

The current tag is a "subset" of the pci branch though, it seems:

http://git.kernel.org/?p=virt/kvm/mst/qemu.git;a=shortlog;h=refs/heads/pci

I could of course try to cherry-pick my patches individually rather than
using git-rebase, but backporting them so far seemed strange enough to
ask first. :)

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg