[foreign-memaccess+abi] RFR: Merge master [v2]
J. Duke
duke at openjdk.org
Fri Oct 7 11:59:39 UTC 2022
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 92 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
>
> The following file contains merge conflicts:
>
> - README.md
>
> 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 +127:openjdk-bot-127
> $ git checkout openjdk-bot-127
>
> # 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-127:127
>
>
> _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 93 commits:
- Merge branch 'foreign-memaccess+abi' into 127
- Automatic merge of jdk:master into master
- 8294907: Remove unused NativeLookup::dll_load
Reviewed-by: dholmes
- 8291429: java/lang/Thread/virtual/ThreadAPI.java timed out on single core system
Reviewed-by: sspitsyn, cjplummer
- 8292280: Unused field 'keyListener' in BasicRadioButtonUI
Reviewed-by: jdv, serb
- 8293810: Remove granting of RuntimePermission("stopThread") from tests
Reviewed-by: dfuchs, mullan, mchung, chegar
- 8292975: javac produces code that crashes with LambdaConversionException
8269983: BootstrapMethodError with method reference and intersection type
Reviewed-by: dlsmith, vromero
- 8075916: The regression-swing case failed as colored text is not shown on disabled checkbox and radio button with Nimbus LAF
Reviewed-by: tr, aivanov
- 6852577: Only for Nimbus LAF UIManager.get("PasswordField.echoChar") is null
Reviewed-by: tr, aivanov
- 6560981: (cal) unused local variables in GregorianCalendar, etc.
Reviewed-by: naoto, bchristi, iris
- ... and 83 more: https://git.openjdk.org/panama-foreign/compare/ca57d13e...653b8723
-------------
Changes: https://git.openjdk.org/panama-foreign/pull/738/files
Webrev: https://webrevs.openjdk.org/?repo=panama-foreign&pr=738&range=01
Stats: 10548 lines in 319 files changed: 6426 ins; 2863 del; 1259 mod
Patch: https://git.openjdk.org/panama-foreign/pull/738.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign pull/738/head:pull/738
PR: https://git.openjdk.org/panama-foreign/pull/738
More information about the panama-dev
mailing list