[foreign-memaccess+abi] RFR: Merge master

J. Duke duke at openjdk.org
Fri Jan 13 11:10:01 UTC 2023


Hi all,

this is an _automatically_ generated pull request to notify you that there are 107 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:

The following files contains merge conflicts:

- src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/linux/LinuxAArch64VaList.java
- src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/SysVVaList.java
- test/jdk/java/foreign/valist/VaListTest.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 +131:openjdk-bot-131
$ git checkout openjdk-bot-131

# 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-131:131


_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
 - 8299957: Enhance error logging in instrument coding with additional jplis_assert_msg
 - 8300040: TypeOopPtr::make_from_klass_common calls itself with args in wrong order
 - 8300068: UBSan CFLAGS/LDFLAGS not passed when building ADLC
 - Merge
 - 8299918: Update Xcode11.3.1-MacOSX10.15 devkit at Oracle
 - 8299034: Runtime::exec clarification of inherited environment
 - 8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR
 - 8299090: Specify coordinate order for additional CaptureCallState parameters on class as well
 - 8299677: Formatter.format might take a long time to format an integer or floating-point
 - ... and 97 more: https://git.openjdk.org/panama-foreign/compare/7f56bf6e...d7a86210

The merge commit only contains trivial merges, so no merge-specific webrevs have been generated.

Changes: https://git.openjdk.org/panama-foreign/pull/769/files
  Stats: 8135 lines in 318 files changed: 5033 ins; 1788 del; 1314 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/769.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign pull/769/head:pull/769

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


More information about the panama-dev mailing list