[foreign-memaccess+abi] RFR: Merge master [v2]

J.Duke duke at openjdk.java.net
Fri Jun 4 16:39:22 UTC 2021


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 3 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
> 
> Over 15 files contains merge conflicts.
> 
> 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+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 +99:openjdk-bot-99
> $ git checkout openjdk-bot-99
> 
> # 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-99:99
> 
> 
> _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 five commits:

 - Undo spurious deletion
 - Merge branch 'foreign-memaccess+abi' into 99
 - Merge
   
   Manual merge of jdk/master into panama-foreign/master to pull in 59a539f
 - 8268129: LibraryLookup::ofDefault leaks symbols from loaded libraries
   
   Reviewed-by: jvernee, psandoz
 - 8265444: Javadocs: jdk.jshell - small typo
   
   Reviewed-by: sundar

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

Changes: https://git.openjdk.java.net/panama-foreign/pull/551/files
 Webrev: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=551&range=01
  Stats: 82 lines in 17 files changed: 15 ins; 7 del; 60 mod
  Patch: https://git.openjdk.java.net/panama-foreign/pull/551.diff
  Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/551/head:pull/551

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


More information about the panama-dev mailing list