[foreign-memaccess+abi] RFR: Merge master [v2]
J. Duke
duke at openjdk.org
Mon Oct 23 12:26:36 UTC 2023
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there are 225 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
>
> Over 46 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 +146:openjdk-bot-146
> $ git checkout openjdk-bot-146
>
> # 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-146:146
>
>
> _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 1128 additional commits since the last revision:
- Merge branch 'foreign-memaccess+abi' into openjdk-bot-146
- Do not run a lengthy test on zero machines
Reviewed-by: jvernee
- 8317137: Time out in TestStringEncoding
Reviewed-by: jvernee
- Fix sonar issues and thread safety bug
Reviewed-by: mcimadamore
- Fix arithmetic bug in SegmentAllocator
Reviewed-by: mcimadamore
- Beef up javadoc for base offset in var handles derived from layouts
Reviewed-by: jvernee
- Automatic merge of master into foreign-memaccess+abi
- Merge master
- 8317050: Scope should reflect lifetime of underying resource
Reviewed-by: jvernee
- Rename max alignment constants for heap segments
Reviewed-by: jvernee
- ... and 1118 more: https://git.openjdk.org/panama-foreign/compare/25af5aea...cc65824f
-------------
Changes:
- all: https://git.openjdk.org/panama-foreign/pull/913/files
- new: https://git.openjdk.org/panama-foreign/pull/913/files/25af5aea..cc65824f
Webrevs:
- full: https://webrevs.openjdk.org/?repo=panama-foreign&pr=913&range=01
- incr: https://webrevs.openjdk.org/?repo=panama-foreign&pr=913&range=00-01
Stats: 1321 lines in 6 files changed: 1315 ins; 3 del; 3 mod
Patch: https://git.openjdk.org/panama-foreign/pull/913.diff
Fetch: git fetch https://git.openjdk.org/panama-foreign.git pull/913/head:pull/913
PR: https://git.openjdk.org/panama-foreign/pull/913
More information about the panama-dev
mailing list