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

J. Duke duke at openjdk.org
Mon May 1 17:53:26 UTC 2023


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 113 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
> 
> Over 35 files contains merge conflicts.
> 
> All Committers in this [project](https://openjdk.org/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.org/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 +138:openjdk-bot-138
> $ git checkout openjdk-bot-138
> 
> # 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-138:138
> 
> 
> _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 incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains 1047 additional commits since the last revision:

 - remove redundant imports
 - Merge branch 'foreign-memaccess+abi' into openjdk-bot-138
 - 8306668: Some foreign tests fail on x86
   
   Reviewed-by: jvernee
 - Automatic merge of master into foreign-memaccess+abi
 - 8303831: TestSegmentCopy times out
   
   Reviewed-by: mcimadamore
 - Automatic merge of master into foreign-memaccess+abi
 - Automatic merge of master into foreign-memaccess+abi
 - 8305369: Issues in zero-length memory segment javadoc section
   
   Reviewed-by: jvernee
 - 8305087: MemoryLayout API checks should be more eager
   
   Reviewed-by: jvernee, pminborg
 - Merge master
 - ... and 1037 more: https://git.openjdk.org/panama-foreign/compare/4bac46db...df1c057d

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

Changes:
  - all: https://git.openjdk.org/panama-foreign/pull/829/files
  - new: https://git.openjdk.org/panama-foreign/pull/829/files/4bac46db..df1c057d

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=panama-foreign&pr=829&range=01
 - incr: https://webrevs.openjdk.org/?repo=panama-foreign&pr=829&range=00-01

  Stats: 2144 lines in 9 files changed: 2027 ins; 45 del; 72 mod
  Patch: https://git.openjdk.org/panama-foreign/pull/829.diff
  Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/829/head:pull/829

PR: https://git.openjdk.org/panama-foreign/pull/829


More information about the panama-dev mailing list