[foreign-memaccess+abi] RFR: Merge master [v2]

[Erik Joelsson]

On Fri, 10 Dec 2021 12:15:46 GMT, J. Duke <duke at openjdk.org> wrote:

>> Hi all,
>> 
>> this is an _automatically_ generated pull request to notify you that there are 126 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
>> 
>> The following file contains merge conflicts:
>> 
>> - src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryAddress.java
>> 
>> 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 +110:openjdk-bot-110
>> $ git checkout openjdk-bot-110
>> 
>> # 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-110:110
>> 
>> 
>> _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
>
> J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 127 commits:
> 
>  - Merge branch 'foreign-memaccess+abi' into openjdk-bot-110
>  - Automatic merge of jdk:master into master
>  - 8277634: Incorrect method name in invokedynamic
>    
>    Reviewed-by: jlaskey
>  - 8278532: Fix some typos in compiler comments
>    
>    Reviewed-by: kvn, jiefu
>  - 8277997: Intrinsic creation for VectorMask.fromLong API
>    
>    Reviewed-by: psandoz, kvn, sviswanathan
>  - 8277807: Increase default initial concurrent refinement threshold
>    
>    Reviewed-by: tschatzl, sjohanss
>  - Merge
>  - 8278521: ProblemList java/lang/management/ThreadMXBean/ThreadLists.java
>    
>    Reviewed-by: bpb
>  - 8278516: Typos in snippet for java.compiler
>    
>    Reviewed-by: darcy
>  - 8278185: Custom JRE cannot find non-ASCII named module inside
>    
>    Reviewed-by: naoto
>  - ... and 117 more: https://git.openjdk.java.net/panama-foreign/compare/8a16279e...677b212b

I think you should do what the message suggests and try the sponsor command.

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

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