[foreign-memaccess+abi] RFR: Merge master
J.Duke
duke at openjdk.java.net
Fri Dec 11 11:05:21 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 131 commits from the branch `master`that can **not** be merged into the branch `foreign-memaccess+abi`:
The following files contains merge conflicts:
- src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryLayout.java
- src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/Utils.java
- test/jdk/java/foreign/TestLayoutPaths.java
- test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverNonConstantFP.java
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 +82:openjdk-bot-82
$ git checkout openjdk-bot-82
# 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-82:82
_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
-------------
Commit messages:
- Automatic merge of jdk:master into master
- 8257970: Remove julong types in os::limit_heap_by_allocatable_memory
- 8257145: Performance regression with -XX:-ResizePLAB after JDK-8079555
- 8257676: Simplify WeakProcessorPhase
- 8196090: javax/swing/JComboBox/6559152/bug6559152.java fails
- 8243205: Modularize JVM flags declaration
- 8258073: x86_32 build broken after JDK-8257731
- 8247402: Documentation for Map::compute contains confusing implementation requirements
- 8257731: Remove excessive include of stubRoutines.hpp
- 8257912: Convert enum iteration to use range-based for loops
- ... and 121 more: https://git.openjdk.java.net/panama-foreign/compare/f5386e0c...fad1a20c
The webrev contains the conflicts with foreign-memaccess+abi:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=panama-foreign&pr=412&range=00.conflicts
Changes: https://git.openjdk.java.net/panama-foreign/pull/412/files
Stats: 31739 lines in 800 files changed: 23347 ins; 5676 del; 2716 mod
Patch: https://git.openjdk.java.net/panama-foreign/pull/412.diff
Fetch: git fetch https://git.openjdk.java.net/panama-foreign pull/412/head:pull/412
PR: https://git.openjdk.java.net/panama-foreign/pull/412
More information about the panama-dev
mailing list