[foreign-memaccess] [Rev 01] RFR: Merge master
J.Duke
duke at openjdk.java.net
Thu Jun 4 11:22:43 UTC 2020
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 105 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/MemoryHandles.java
> - src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.java
> - src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MappedMemorySegmentImpl.java
> - test/micro/org/openjdk/bench/jdk/incubator/foreign/TestAdaptVarHandles.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 +41:openjdk-bot-41
> $ git checkout openjdk-bot-41
>
> # 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-41:41
>
> _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
J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains
106 commits:
- Merge branch 'foreign-memaccess' into openjdk-bot-41
- Merge remote-tracking branch 'remotes/jdk/master'
- Added tag jdk-15+26 for changeset 0a32396f7a69
- 8246397: Use KnownOIDs for known OIDs
Reviewed-by: xuelei
- 8245283: JFR: Can't handle constant dynamic used by Jacoco agent
Reviewed-by: mgronlun
- 8246260: JFR: Write event size field without padding
Reviewed-by: jbachorik, mgronlun
- 8246451: Reduce overhead of normalizing file paths with trailing slash
Reviewed-by: lancea
- 8246458: Shenandoah: TestAllocObjects.java test fail with -XX:+ShenandoahVerify
Reviewed-by: shade
- 8246095: Tweaks to memory access API
Add more user friendly API points to the foreign memory acesss API
Reviewed-by: chegar, psandoz
- 8238763: ObjectInputStream readUnshared method handling of Records
Reviewed-by: rriggs
- ... and 96 more: https://git.openjdk.java.net/panama-foreign/compare/02152502...12e2ae6c
/integrate
-------------
Changes: https://git.openjdk.java.net/panama-foreign/pull/194/files
Webrev: https://webrevs.openjdk.java.net/panama-foreign/194/webrev.01
Stats: 19230 lines in 842 files changed: 14094 ins; 2220 del; 2916 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/194.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/194/head:pull/194
PR: https://git.openjdk.java.net/panama-foreign/pull/194
More information about the panama-dev
mailing list