Problems when merging stage/hotspot with hotspot-main/hotspot

[Volker Simonis]

Hi Vladimir,

currently we have problems because stage/hotspot doesn't automatically
merges with hotspot-main/hotspot (and all the other hsx repositories)
any more.

This is because of "8014135: The JVMTI specification does not conform
to recent changes in JNI specification" in hsx which conflicts with
the latest "8023033: PPC64 (part 13): basic changes for AIX" in stage.

Any idea when 8014135 will arrive in jdk8/hotspot and when you will
sync up jdk8 to stage the next time? The problem we have is that all
our builds which test our patch-queue against the various
hsx-repositories are currently broken because we can not merge stage
with hsx automatically.

We would therefore be really interested in bringing 8014135 as fast as
possible into stage. If this will not happen soon, do you see any
possibility in doing this manually? I think just importing 8014135
isn't a good idea either because then we will eventually end up with
two changesets with the same bug ID.

Thank you and best regards,
Volker

PS: for your convenience I've added a merged version of
'src/os/posix/vm/os_posix.cpp' which solves the problem.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: os_posix.cpp
Type: text/x-c++src
Size: 26390 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/ppc-aix-port-dev/attachments/20130902/43cb9c3e/os_posix-0001.cpp