[foreign-memaccess+abi] RFR: Merge master

J. Duke duke at openjdk.org
Fri Mar 17 11:08:36 UTC 2023


Hi all,

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

Over 17 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 +136:openjdk-bot-136
$ git checkout openjdk-bot-136

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


_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
 - 8304130: Add runtime/StackGuardPages/TestStackGuardPagesNative.java to ProblemList.txt
 - 8299375: [PPC64] GetStackTraceSuspendedStressTest tries to deoptimize frame with invalid fp
 - 8304063: tools/jpackage/share/AppLauncherEnvTest.java fails when checking LD_LIBRARY_PATH
 - 8304242: CPUInfoTest fails because "serialize" CPU feature is not known
 - 7154070: in SwingSet2, switching between LaFs it's easy to lose JTable dividers
 - 8304146: Refactor VisibleMemberTable (LocalMemberTable)
 - 8303150: DCmd framework unnecessarily creates a DCmd instance on registration
 - 8304360: Test to ensure ConstantDescs fields work
 - 8304225: Remove javax/script/Test7.java from ProblemList
 - ... and 85 more: https://git.openjdk.org/panama-foreign/compare/2693c967...7d96468e

The webrev contains the conflicts with foreign-memaccess+abi:
 - merge conflicts: https://webrevs.openjdk.org/?repo=panama-foreign&pr=823&range=00.conflicts

Changes: https://git.openjdk.org/panama-foreign/pull/823/files
  Stats: 74258 lines in 686 files changed: 44999 ins; 20435 del; 8824 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/823.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign pull/823/head:pull/823

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


More information about the panama-dev mailing list