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

J. Duke duke at openjdk.org
Fri Dec 2 19:49:29 UTC 2022


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 120 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
> 
> The following file contains merge conflicts:
> 
> - test/jdk/java/foreign/malloc/TestMixedMallocFree.java
> 
> All Committers in this [project](https://openjdk.org/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.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-bot/panama-foreign.git +129:openjdk-bot-129
> $ git checkout openjdk-bot-129
> 
> # 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-129:129
> 
> 
> _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 121 commits:

 - Merge master
 - Automatic merge of jdk:master into master
 - 8297645: Drop the test/jdk/java/net/httpclient/reactivestreams-tck-tests/TckDriver.java test
   
   Reviewed-by: alanb, jpai, michaelm
 - 8297549: RISC-V: Add support for Vector API vector load const operation
   
   Reviewed-by: fyang, gcao
 - 8297715: RISC-V: C2: Use single-bit instructions from the Zbs extension
   
   Reviewed-by: fjiang, yadongwang, shade
 - 8297784: Optimize @Stable field for Method.isCallerSensitive
   
   Reviewed-by: redestad, jvernee, alanb
 - 8297992: Tests fail after JDK-8297215 due to lack of @enablePreview
   
   Reviewed-by: darcy
 - 8297455: Use the official ToolProvider API to call javac
   
   Reviewed-by: erikj
 - 8297444: Refactor the javacserver build tool
   
   Reviewed-by: erikj, cstein
 - 8297875: jar should not compress the manifest directory entry
   
   Reviewed-by: lancea
 - ... and 111 more: https://git.openjdk.org/panama-foreign/compare/cd169fdd...7dfc2af6

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

Changes: https://git.openjdk.org/panama-foreign/pull/756/files
 Webrev: https://webrevs.openjdk.org/?repo=panama-foreign&pr=756&range=01
  Stats: 34235 lines in 772 files changed: 14047 ins; 16631 del; 3557 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/756.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign pull/756/head:pull/756

PR: https://git.openjdk.org/panama-foreign/pull/756


More information about the panama-dev mailing list