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

J. Duke duke at openjdk.org
Fri Dec 9 15:11:46 UTC 2022


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 136 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
> 
> Over 180 files contains merge conflicts.
> 
> 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 +130:openjdk-bot-130
> $ git checkout openjdk-bot-130
> 
> # 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-130:130
> 
> 
> _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 137 commits:

 - Merge master
 - Automatic merge of jdk:master into master
 - 8297778: Modernize and improve module jdk.sctp
   
   Reviewed-by: dfuchs, stsypanov
 - 8257197: Add additional verification code to PhaseCCP
   
   Reviewed-by: chagedorn, kvn, thartmann
 - 8297679: InvocationTargetException field named target is not declared final
   
   Reviewed-by: alanb
 - 8298083: The "CheckBox/RadioButton[Enabled/Disabled].textForeground" stoped working
   
   Reviewed-by: psadhukhan
 - 8298138: Shenandoah: HdrSeq asserts "sub-bucket index (512) overflow for value ( 1.00)"
   
   Reviewed-by: rkennke, shade
 - 8292289: [vectorapi] Improve the implementation of VectorTestNode
   
   Reviewed-by: xgong, kvn
 - 8297295: Remove ThreadGroup.allowThreadSuspension
   
   Reviewed-by: jpai, smarks, chegar, darcy
 - 8296149: Start of release updates for JDK 21
   8296150: Add SourceVersion.RELEASE_21
   8296151: Add source 21 and target 21 to javac
   
   Reviewed-by: dholmes, iris, erikj, vromero, jlahoda
 - ... and 127 more: https://git.openjdk.org/panama-foreign/compare/d379ca1c...3ca4ba74

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

Changes: https://git.openjdk.org/panama-foreign/pull/757/files
 Webrev: https://webrevs.openjdk.org/?repo=panama-foreign&pr=757&range=01
  Stats: 27804 lines in 921 files changed: 18181 ins; 5845 del; 3778 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/757.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign pull/757/head:pull/757

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


More information about the panama-dev mailing list