[foreign-abi] RFR: Cannot automatically merge openjdk/panama-foreign:foreign-memaccess to foreign-abi

J.Duke duke at openjdk.java.net
Thu Mar 12 17:44:16 UTC 2020


The following commits from foreign-memaccess could *not* be automatically merged into foreign-abi:

- a5399004: 8240874: Add finer-grained access control for memory segments

The following files contains merge conflicts:

- src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MemorySegmentImpl.java

To manually resolve these merge conflicts, please create a personal fork of https://git.openjdk.java.net/panama-foreign
and execute the following commands:

$ git checkout foreign-abi
$ git pull https://git.openjdk.java.net/panama-foreign foreign-abi
$ git checkout --branch merge-foreign-memaccess-into-foreign-abi
$ git pull https://git.openjdk.java.net/panama-foreign foreign-memaccess

When you have resolved the conflicts resulting from the above commands, run:

$ git add paths/to/files/with/conflicts
$ git commit -m 'Merge foreign-memaccess'

Push the merge commit to your personal fork:

$ git push -u origin merge-foreign-memaccess-into-foreign-abi

Now proceed to create a pull request towards this repository.
If you are using the [Skara](https://wiki.openjdk.java.net/display/skara#Skara-Skara)CLI tooling then you can run the
following command to create the pull request:

$ git pr create

This pull request will be closed automatically by a bot once the merge conflicts have been resolved.

-------------

Commit messages:
 - 8240874: Add finer-grained access control for memory segments

Changes: https://git.openjdk.java.net/panama-foreign/pull/46/files
 Webrev: https://webrevs.openjdk.java.net/panama-foreign/46/webrev.00
  Stats: 262 lines in 7 files changed: 198 ins; 28 del; 36 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/46.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/46/head:pull/46

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


More information about the panama-dev mailing list