[records-2] RFR: Merge master

J.Duke duke at openjdk.java.net
Thu Nov 12 22:06:20 UTC 2020


Hi all,

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

The following file contains merge conflicts:

- test/langtools/tools/javac/records/RecordsBinaryCompatibilityTests.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 records-2
$ git pull https://github.com/openjdk/amber.git records-2

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

# Merge the target branch
$ git merge records-2

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-74:74

_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:
 - 8256278: Shenandoah: Avoid num of dead callback from weak processor in Shenandoah root verifier
 - 8256244: java/lang/ProcessHandle/PermissionTest.java fails with TestNG 7.1
 - 8255546: Missing coverage for javax.smartcardio.CardPermission and ResponseAPDU
 - 8256201: java/awt/FullScreen/FullscreenWindowProps/FullscreenWindowProps.java failed
 - 8254162: Implementation of Foreign-Memory Access API (Third Incubator)
 - 8255990: Bitmap region of dynamic CDS archive is not unmapped
 - 8256276: Temporarily disable gtest special_flags
 - 8256238: Remove Matcher::pass_original_key_for_aes
 - 8256203: Simplify RegMask::Empty
 - 8250607: C2: Filter type in PhiNode::Value() for induction variables of trip-counted integer loops
 - ... and 77 more: https://git.openjdk.java.net/amber/compare/e66fd6f0...531c56ea

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

Changes: https://git.openjdk.java.net/amber/pull/71/files
  Stats: 69744 lines in 826 files changed: 38631 ins; 20929 del; 10184 mod
  Patch: https://git.openjdk.java.net/amber/pull/71.diff
  Fetch: git fetch https://git.openjdk.java.net/amber pull/71/head:pull/71

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


More information about the amber-dev mailing list