[vectorIntrinsics] Integrated: 8255280: Fix trivial merge conflicts for JDK-8253211

Tue Oct 27 02:21:23 UTC 2020

On Fri, 23 Oct 2020 07:31:36 GMT, Ningsheng Jian <njian at openjdk.org> wrote:

> My patch JDK-8254884 in jdk mainline and JDK-8253211 in panama vectorIntrinsics have some conflicts, which causes a partial merge. This fixes vectorIntrinsics to align with jdk mainline.

This pull request has now been integrated.

Changeset: c802deb5
Author:    Ningsheng Jian <njian at openjdk.org>
URL:       https://git.openjdk.java.net/panama-vector/commit/c802deb5
Stats:     14 lines in 3 files changed: 0 ins; 12 del; 2 mod

8255280: Fix trivial merge conflicts for JDK-8253211

Reviewed-by: psandoz

-------------

PR: https://git.openjdk.java.net/panama-vector/pull/18