[foreign-memaccess+abi] RFR: Merge master
J. Duke
duke at openjdk.org
Fri Oct 7 11:09:49 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
-------------
Commit messages:
- Automatic merge of jdk:master into master
- 8294907: Remove unused NativeLookup::dll_load
- 8291429: java/lang/Thread/virtual/ThreadAPI.java timed out on single core system
- 8292280: Unused field 'keyListener' in BasicRadioButtonUI
- 8293810: Remove granting of RuntimePermission("stopThread") from tests
- 8292975: javac produces code that crashes with LambdaConversionException
- 8075916: The regression-swing case failed as colored text is not shown on disabled checkbox and radio button with Nimbus LAF
- 6852577: Only for Nimbus LAF UIManager.get("PasswordField.echoChar") is null
- 6560981: (cal) unused local variables in GregorianCalendar, etc.
- 8281453: New optimization: convert ~x into -1-x when ~x is used in an arithmetic expression
- ... and 82 more: https://git.openjdk.org/panama-foreign/compare/61d500f3...b1b4fee3
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.org/?repo=panama-foreign&pr=738&range=00.conflicts
Changes: https://git.openjdk.org/panama-foreign/pull/738/files
Stats: 10544 lines in 319 files changed: 6423 ins; 2863 del; 1258 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