[foreign-memaccess+abi] RFR: Merge master

[Maurizio Cimadamore]

Thanks!

Maurizio


On 05/03/2021 11:11, Jorn Vernee wrote:
> On Fri, 5 Mar 2021 11:01:04 GMT, J. Duke <duke at openjdk.org> wrote:
>
>> Hi all,
>>
>> this is an _automatically_ generated pull request to notify you that there are 95 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
>>
>> The following files contains merge conflicts:
>>
>> - src/hotspot/cpu/aarch64/frame_aarch64.cpp
>> - src/hotspot/cpu/x86/frame_x86.cpp
>> - src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp
>>
>> 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 +90:openjdk-bot-90
>> $ git checkout openjdk-bot-90
>>
>> # 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-90:90
>>
>> _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
> I'll look at this. (Saw this one coming)
>
> -------------
>
> PR: https://git.openjdk.java.net/panama-foreign/pull/467