Re: [Qemu-devel] [PATCH 11/13] Move pci_parse_devaddr to qdev-properties

[Anthony Liguori <anthony@codemonkey.ws>]

On 06/08/2012 10:17 PM, Michael S. Tsirkin wrote:
> On Fri, Jun 08, 2012 at 02:45:47PM +0200, Jan Kiszka wrote:
>> On 2012-06-08 14:18, Andreas Färber wrote:
>>> Am 08.06.2012 14:14, schrieb Jan Kiszka:
>>>> On 2012-06-08 14:03, Andreas Färber wrote:
>>>>> Can't understand that you're trying to push your v1 so hard now when our
>>>>> series have been on the list for much longer. ;)
>>>>
>>>> I explained the reason, and I think my patches (minus the dropped one)
>>>> are ready based on the feedback.
>>>>
>>>> I'm fine if important central refactorings close master for a short
>>>> period at the beginning of a merge window and require rebasing of other
>>>> patches afterward. But that should really be *short*.
>>>
>>> We had a long Hard Freeze that closed master. Your patches are new, so I
>>> oppose you sneaking by and having me rebase Paolo's patches on yours. If
>>> someone else wants to rebase them on yours that's fine with me.
>>
>> If your patches get merged over the next week, I'm fine. If not, be
>> warned to see me grumbling again. ;)
>>
>> Michael, unless there are other remarks, 1 and 3-10 could be picked up
>> by you and pushed already. I'll send an update for 6 to fix the commit log.
>>
>> Jan
>
> They look ready to me too, so I can pick your patches up and put them on
> the pci branch. Prefer doing it Sunday when I'm rested.
> But FYI I just sent a pull request to Anthony Thursday and I
> try not to flood him with more than one a week unless there's a huge
> regression to fix.

FYI, I don't plan on applying any more pulls until Monday most likely as I'm 
flying back to the US tomorrow morning.  If you want to update the PULL on 
Sunday, just send out a new request that includes the old and I'll ignore it.

Paolo's series may conflict, but I don't think resolving will be too hard.

Regards,

Anthony Liguori

>
> If large changes land in master meanwhile we'll have to resolve the
> conflict but that's par for the course.
>
>> --
>> Siemens AG, Corporate Technology, CT T DE IT 1
>> Corporate Competence Center Embedded Linux