[sealed-types] RFR: Merge master

J.Duke duke at openjdk.java.net
Thu Nov 26 22:09:19 UTC 2020


Hi all,

this is an _automatically_ generated pull request to notify you that there are 129 commits from the branch `master`that can **not** be merged into the branch `sealed-types`:

The following file contains merge conflicts:

- src/java.base/share/classes/java/lang/Package.java

All Committers in this [project](https://openjdk.java.net/census#amber) have access to my [personal fork](https://github.com/openjdk-bot/amber) 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/amber](https://github.com/openjdk/amber) repository.

# Ensure target branch is up to date
$ git checkout sealed-types
$ git pull https://github.com/openjdk/amber.git sealed-types

# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/amber.git +75:openjdk-bot-75
$ git checkout openjdk-bot-75

# Merge the target branch
$ git merge sealed-types

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/amber.git openjdk-bot-75:75

_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:
 - 8255351: Add detection for Graviton 2 CPUs
 - 8220730: sun.security.provider.SecureRandom default constructor has wrong documentation
 - 8256359: AArch64: runtime/ReservedStack/ReservedStackTestCompiler.java fails
 - 8256488: [aarch64] Use ldpq/stpq instead of ld4/st4 for small copies in StubGenerator::copy_memory
 - 8255277: randomDelay in DrainDeadlockT and LoggingDeadlock do not randomly delay
 - 8257069: C2: Clarify and sanity test RegMask/RegMaskIterator
 - 8257151: ZGC: Simplify ZVerify
 - 8257073: ZGC: Try forward object before retaining page
 - 8256831: MIPS Zero builds fail with undefined __atomic_compare_exchange_8
 - 8256862: Several java/foreign tests fail on x86_32 platforms
 - ... and 119 more: https://git.openjdk.java.net/amber/compare/c1407733...2215e5a4

The webrev contains the conflicts with sealed-types:
 - merge conflicts: https://webrevs.openjdk.java.net/?repo=amber&pr=72&range=00.conflicts

Changes: https://git.openjdk.java.net/amber/pull/72/files
  Stats: 143307 lines in 934 files changed: 117242 ins; 8468 del; 17597 mod
  Patch: https://git.openjdk.java.net/amber/pull/72.diff
  Fetch: git fetch https://git.openjdk.java.net/amber pull/72/head:pull/72

PR: https://git.openjdk.java.net/amber/pull/72


More information about the amber-dev mailing list