[foreign-memaccess+abi] RFR: Merge master

J. Duke duke at openjdk.org
Fri Mar 3 11:08:40 UTC 2023


Hi all,

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

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

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


_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
 - 8303539: javadoc typos in Attr
 - 8303473: Add implied {@code} in java.lang.invoke.MethodHandles
 - 8143900: OptimizeStringConcat has an opaque dependency on Integer.sizeTable field
 - 8302830: AArch64: Fix the mismatch between cas.m4 and aarch64.ad
 - 8302783: Improve CRC32C intrinsic with crypto pmull on AArch64
 - 8303405: fix @returnss typo in ReflectionFactory
 - 8302495: update for deprecated sprintf for java.desktop
 - 8303442: Clean up w2k_lsa_auth linker parameters
 - 8303267: Prefer ArrayList to LinkedList in ConcurrentLocksPrinter
 - ... and 71 more: https://git.openjdk.org/panama-foreign/compare/d688575c...b378aa7d

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

Changes: https://git.openjdk.org/panama-foreign/pull/808/files
  Stats: 12436 lines in 459 files changed: 7765 ins; 2751 del; 1920 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/808.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign pull/808/head:pull/808

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


More information about the panama-dev mailing list