RFR: 8078193: BACKOUT: Rename and clean up the ParGCAllocBuffer class

Kim Barrett kim.barrett at oracle.com
Tue Apr 21 13:50:07 UTC 2015


On Apr 21, 2015, at 8:51 AM, Thomas Schatzl <thomas.schatzl at oracle.com> wrote:
> 
> On Tue, 2015-04-21 at 10:09 +0200, Bengt Rutisson wrote:
>> Doing hg backout does not apply cleanly for me.
>> 
>> $ hg backout -r 8148
> [...]
>> merging src/share/vm/runtime/globals.hpp
>> merging src/share/vm/runtime/globals.hpp failed!
>> 142 files updated, 0 files merged, 1 files removed, 1 files unresolved
>> use 'hg resolve' to retry unresolved file merges
> 
> Backout works here.

And here.

> 
>> There is a conflict in globals.hpp. But the patch file provided in the 
>> webrev:
>> http://cr.openjdk.java.net/~kbarrett/8078193/webrev.00/hotspot.changeset
>> 
>> applies cleanly for me and does the right thing to globals.hpp.
>> 
>> So, I think the webrev looks fine. Reviewed.
> 
> Think so too. Please push this backout and the good change at the same
> time as Bengt suggested.
> 
> Thanks,
>  Thomas

Thanks for your review.  I’ll IM you and Bengt to find out what you mean about pushing both at the same time.



More information about the hotspot-gc-dev mailing list