[foreign-memaccess+abi] Integrated: Merge master

[J.Duke]

On Wed, 2 Jun 2021 14:29:22 GMT, J. Duke <duke at openjdk.org> wrote:

> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 152 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
> 
> Over 63 files contains merge conflicts.
> 
> All Committers in this [project](https://openjdk.java.net/census#panama) have access to my [personal fork](https://github.com/openjdk-bot/panama-foreign) and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
> The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request.
> The below commands should be run in a local clone of your [personal fork](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the [openjdk/panama-foreign](https://github.com/openjdk/panama-foreign) repository.
> 
> 
> # Ensure target branch is up to date
> $ git checkout foreign-memaccess+abi
> $ git pull https://github.com/openjdk/panama-foreign.git foreign-memaccess+abi
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/panama-foreign.git +97:openjdk-bot-97
> $ git checkout openjdk-bot-97
> 
> # Merge the target branch
> $ git merge foreign-memaccess+abi
> 
> 
> When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create a merge commit:
> 
> 
> $ git add paths/to/files/with/conflicts
> $ git commit -m 'Merge master'
> 
> 
> 
> When you have created the merge commit, run the following command to push the merge commit to this pull request:
> 
> 
> $ git push https://github.com/openjdk-bot/panama-foreign.git openjdk-bot-97:97
> 
> 
> _Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
> 
> Thanks,
> J. Duke

This pull request has now been integrated.

Changeset: 1a6aa790
Author:    J. Duke <duke at openjdk.org>
Committer: Maurizio Cimadamore <mcimadamore at openjdk.org>
URL:       https://git.openjdk.java.net/panama-foreign/commit/1a6aa790fee31d31c92e829cdef1a53cac7bb6f2
Stats:     73283 lines in 3379 files changed: 17871 ins; 48932 del; 6480 mod

Merge master

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

PR: https://git.openjdk.java.net/panama-foreign/pull/545