[foreign-memaccess] RFR: Merge master

J.Duke duke at openjdk.java.net
Fri Nov 27 11:06:17 UTC 2020


Hi all,

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

The following files contains merge conflicts:

- src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryAccess.java
- src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/Utils.java
- test/jdk/java/foreign/TestLayoutPaths.java
- test/jdk/java/foreign/TestNulls.java

All Committers in this [project](https://openjdk.java.net/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.java.net/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
$ git pull https://github.com/openjdk/panama-foreign.git foreign-memaccess

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/panama-foreign.git +78:openjdk-bot-78
$ git checkout openjdk-bot-78

# Merge the target branch
$ git merge foreign-memaccess

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-78:78

_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
 - 8242652: Throw SkippedException if no JS engine availabe in TestSearchScript
 - 8252645: Change time measurements in G1ServiceThread to only account remembered set work
 - 8257181: s390x builds are very noisy with gc-sections messages
 - 8256757: Incorrect MachCallRuntimeNode::ret_addr_offset() for CallLeafNoFP on x86_32
 - 8255351: Add detection for Graviton 2 CPUs
 - 8220730: sun.security.provider.SecureRandom default constructor has wrong documentation
 - 8256359: AArch64: runtime/ReservedStack/ReservedStackTestCompiler.java fails
 - 8256488: [aarch64] Use ldpq/stpq instead of ld4/st4 for small copies in StubGenerator::copy_memory
 - 8255277: randomDelay in DrainDeadlockT and LoggingDeadlock do not randomly delay
 - ... and 115 more: https://git.openjdk.java.net/panama-foreign/compare/e27fef1f...0cef30d6

The webrev contains the conflicts with foreign-memaccess:
 - merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=402&range=00.conflicts

Changes: https://git.openjdk.java.net/panama-foreign/pull/402/files
  Stats: 85744 lines in 714 files changed: 75087 ins; 3548 del; 7109 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/402.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/402/head:pull/402

PR: https://git.openjdk.java.net/panama-foreign/pull/402


More information about the panama-dev mailing list