[vectorInstrinsics] merge with upstream failed

[Maurizio Cimadamore]

On 02/10/18 17:50, Viswanathan, Sandhya wrote:
> Thanks Maurizio for bringing our attention to this. FYI, we completed the manual merge yesterday.
Thanks, I noted that our internal build systems went back to green!

Cheers
Maurizio
>
> Best Regards,
> Sandhya
>
>
> -----Original Message-----
> From: panama-dev [mailto:panama-dev-bounces at openjdk.java.net] On Behalf Of Maurizio Cimadamore
> Sent: Monday, October 01, 2018 6:26 AM
> To: 'panama-dev at openjdk.java.net' <panama-dev at openjdk.java.net>
> Subject: [vectorInstrinsics] merge with upstream failed
>
> Hi,
> the vectorIntrinsics branch failed to merge because of the following
> conflicts:
>
> U src/hotspot/cpu/x86/assembler_x86.cpp
> U src/hotspot/cpu/x86/macroAssembler_x86.cpp
> U src/hotspot/cpu/x86/vm_version_x86.hpp
> U src/hotspot/cpu/x86/x86.ad
>
> I tried to take a look but the changes look a bit too deep for me to
> handle the merge. Could please somebody from the vector team look at the
> conflicts?
>
> To start a merge:
>
> $ hg update vectorIntrinsics
>
> $ hg merge -r default
>
> <do merge>
>
> $ hg commit -m 'manual merge with default'
>
> $ hg push
>
> Cheers
> Maurizio
>