[foreign-memaccess+abi] RFR: Merge master

J. Duke duke at openjdk.org
Fri Oct 21 11:10:15 UTC 2022


Hi all,

this is an _automatically_ generated pull request to notify you that there are 118 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 +128:openjdk-bot-128
$ git checkout openjdk-bot-128

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


_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
 - 8295530: Update Zlib Data Compression Library to Version 1.2.13
 - 8295666: Linux x86 build fails after 8292591
 - 8294460: CodeSection::alignment checks for CodeBuffer::SECT_STUBS incorrectly
 - 8030616: sun/management/jmxremote/bootstrap/RmiBootstrapTest fails intermittently with cannot find a free port
 - 8295714: GHA ::set-output is deprecated and will be removed
 - 8295657: SA: Allow larger object alignments
 - 8280131: jcmd reports "Module jdk.jfr not found." when "jdk.management.jfr" is missing
 - 8295703: RISC-V: Remove implicit noreg temp register arguments in MacroAssembler
 - 8295697: Resolve conflicts between serviceability/jvmti and nsk/jvmti shared code
 - ... and 108 more: https://git.openjdk.org/panama-foreign/compare/d46a9e40...f42e9418

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

Changes: https://git.openjdk.org/panama-foreign/pull/744/files
  Stats: 30827 lines in 1083 files changed: 19310 ins; 6858 del; 4659 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/744.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign pull/744/head:pull/744

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


More information about the panama-dev mailing list