[foreign-memaccess] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Jun 26 11:10:23 UTC 2020
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`:
The following files contains merge conflicts:
- src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryLayout.java
- src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.java
- src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/package-info.java
All Committers in this [project](https://openjdk.java.net/census#Optional[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 foreign-memaccess
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/panama-foreign +43:openjdk-bot-43
$ git checkout openjdk-bot-43
# 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 openjdk-bot-43:43
_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
- 8248334: hs build errors on ppc64 and s390x platforms
- 8247747: Remove macro definition of "inline" in stack.hpp
- Merge
- 8248347: windows build broken by JDK-8243114
- 8248358: ProblemList sun/nio/ch/TestMaxCachedBufferSize.java on macOSX
- 8248351: ProblemList serviceability/jvmti/ModuleAwareAgents/ThreadStart/MAAThreadStart.java on Windows
- 8248354: ProblemList vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java
- 8247849: permits clause of sealed interfaces should not allow parameterized types
- 8248302: JFR: Add test for OldObjectSample event when using ZGC
- ... and 97 more: https://git.openjdk.java.net/panama-foreign/compare/e9afd8d3...321f216f
The webrev contains the conflicts with foreign-memaccess:
- merge conflicts: https://webrevs.openjdk.java.net/panama-foreign/215/webrev.00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/215/files
Stats: 24764 lines in 480 files changed: 12729 ins; 10523 del; 1512 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/215.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/215/head:pull/215
PR: https://git.openjdk.java.net/panama-foreign/pull/215
More information about the panama-dev
mailing list