[records-2] RFR: Merge master
J.Duke
duke at openjdk.java.net
Thu Oct 29 22:08:18 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 110 commits from the branch `master`that can **not** be merged into the branch `records-2`:
Over 19 files contains merge conflicts.
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 +65:openjdk-bot-65
$ git checkout openjdk-bot-65
# 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-65:65
_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:
- 8254975: lambda proxy fails to access a protected member inherited from a split package
- 8255604: java/nio/channels/DatagramChannel/Connect.java fails with java.net.BindException: Cannot assign requested address: connect
- 8255449: Improve the exception message of MethodHandles::permuteArguments
- 8241495: Make more compiler related flags available on a per method level
- 8255232: G1: Make G1BiasedMappedArray freeable
- 8255550: x86: Assembler::cmpq(Address dst, Register src) encoding is incorrect
- 8255243: Reinforce escape barrier interactions with ZGC conc stack processing
- 8255534: Shenandoah: Fix CmpP optimization wrt native-LRB
- 8255564: InterpreterMacroAssembler::remove_activation() needs to restore thread right after VM call on x86_32
- 8255579: x86: Use cmpq(Register,Address) in safepoint_poll
- ... and 100 more: https://git.openjdk.java.net/amber/compare/8afdcaee...5782a2a3
The webrev contains the conflicts with records-2:
- merge conflicts: https://webrevs.openjdk.java.net/?repo=amber&pr=65&range=00.conflicts
Changes: https://git.openjdk.java.net/amber/pull/65/files
Stats: 15635 lines in 515 files changed: 9013 ins; 4769 del; 1853 mod
Patch: https://git.openjdk.java.net/amber/pull/65.diff
Fetch: git fetch https://git.openjdk.java.net/amber pull/65/head:pull/65
PR: https://git.openjdk.java.net/amber/pull/65
More information about the amber-dev
mailing list