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

duke duke at openjdk.org
Tue Jul 2 15:40:51 UTC 2024


On Tue, 2 Jul 2024 15:21:07 GMT, J. Duke <duke at openjdk.org> wrote:

>> Hi all,
>> 
>> this is an _automatically_ generated pull request to notify you that there are 96 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
>> 
>> The following file contains merge conflicts:
>> 
>> - .jcheck/conf
>> 
>> All Committers in this [project](https://openjdk.org/census#panama) have access to my [personal fork](https://github.com/openjdk-bots/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.org/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-bots/panama-foreign.git +21:openjdk-bot-21
>> $ git checkout openjdk-bot-21
>> 
>> # 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-bots/panama-foreign.git openjdk-bot-21:21
>> 
>> 
>> _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 97 commits:
> 
>  - Merge branch 'foreign-memaccess+abi' into 21
>  - Automatic merge of jdk:master into master
>  - 8269657: Test java/nio/channels/DatagramChannel/Loopback.java failed: Unexpected message
>    
>    Reviewed-by: dfuchs
>  - 8334433: jshell.exe runs an executable test.exe on startup
>    
>    Reviewed-by: jpai
>  - 8335142: compiler/c1/TestTraceLinearScanLevel.java occasionally times out with -Xcomp
>    
>    Reviewed-by: thartmann, kvn
>  - 8335314: Problem list compiler/uncommontrap/DeoptReallocFailure.java
>    
>    Reviewed-by: chagedorn
>  - 8319947: Recursive lightweight locking: s390x implementation
>    
>    Reviewed-by: aboldtch, lucy
>  - 8334147: Shenandoah: Avoid taking lock for disabled free set logging
>    
>    Reviewed-by: shade, ysr
>  - 8334645: Un-problemlist vmTestbase/nsk/sysdict/vm/stress/chain/chain007/chain007.java
>    
>    Reviewed-by: thartmann, lmesnik
>  - 8334763: --enable-asan: assert(_thread->is_in_live_stack((address)this)) failed: not on stack?
>    
>    Reviewed-by: kbarrett, stuefe, erikj
>  - ... and 87 more: https://git.openjdk.org/panama-foreign/compare/174fb857...f1d6e5cd

@openjdk[bot] 
Your change (at version f1d6e5cd8929a16d0bbe646e301fb46a7a04c0f2) is now ready to be sponsored by a Committer.

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

PR Comment: https://git.openjdk.org/panama-foreign/pull/916#issuecomment-2203570052


More information about the panama-dev mailing list