Re: [Qemu-devel] [PATCH v4 00/29] NUMA series and hostmem improvements

[Michael S. Tsirkin]

On Tue, Jun 10, 2014 at 06:19:35PM +0800, Hu Tao wrote:
> On Tue, Jun 10, 2014 at 12:56:56PM +0300, Michael S. Tsirkin wrote:
> > On Tue, Jun 10, 2014 at 05:51:48PM +0800, Hu Tao wrote:
> > > On Mon, Jun 09, 2014 at 02:40:30PM +0300, Michael S. Tsirkin wrote:
> > > > On Mon, Jun 09, 2014 at 01:30:05PM +0300, Michael S. Tsirkin wrote:
> > > > > On Mon, Jun 09, 2014 at 06:25:05PM +0800, Hu Tao wrote:
> > > > > > note: this series is based on MST's pci tree.
> > > > > 
> > > > > No, please rebase on top of numa branch in my tree, not on
> > > > > pci branch.
> > > > > I applied a bunch of your there and don't want
> > > > > spend time going over them again.
> > > > > 
> > > > 
> > > > If you want me to drop some patches, pls mention this
> > > > in the cover letter. But you don't need to keep
> > > > reposting everything.
> > > 
> > > 4 patches dropped from your numa tree.
> > 
> > OK, which ones?
> 
> b36ea0f3c7eae45b71bd238fe5a3ade58ee3b1f8  NUMA: check if the total numa 
> memory size is equal to ram_size
> 
> bf40b6aa334d9cc92ca2be6db743f009f20206e7  qmp: improve error reporting for 
> -object and object-add
> 
> bc95a49358d37b0079435ad1a54ac35e324b1ab5  numa: introduce 
> memory_region_allocate_system_memory
> 
> e517f31225795983f7cbaedb93a07d930bd8f939  numa: add -numa node, memdev= option
> 
> 
> These 4 patches are modified according to comments to v4. they are in
> the middle of your numa tree, how can I rebase them?

Ah so they are modified, not dropped.
Send patches on top as part of your series, with subjects like this:

fixup! NUMA: check if the total numa memory size is equal to ram_size

When I apply the fixups automatically float up.

> 
> 
> > 
> > > And do you mind patches
> > > reordering? I rebased v5 on commit 7a3af0813f9, the patches keep in
> > > order as in v4. Those patches with your Acked-by line are cherry-picked
> > > from your numa tree without conflict. Are you OK with this?
> > > 
> > > Hu
> > 
> > I'd like to avoid reposting same patches.
> > Can't you rebase on top of 0b85e768de158cf815003638df228ba1424c6c3b?
> > What's the problem?
> > 
> > 
> > -- 
> > MST