[pattern-runtime] RFR: Merge master

J.Duke duke at openjdk.java.net
Mon Nov 16 12:50:45 UTC 2020


Hi all,

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

The following files contains merge conflicts:

- src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java
- src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
- src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
- src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.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 pattern-runtime
$ git pull https://github.com/openjdk/amber.git pattern-runtime

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

# Merge the target branch
$ git merge pattern-runtime

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

_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:
 - 8255756: Disabling logging does unnecessary work
 - 8255894: Remove unused StubRoutines::_zero_aligned_words
 - 8255955: Shenandoah: Only STW GC should process concurrent roots at pauses
 - 8255913: Decrease number of iterations in TestMaxCachedBufferSize
 - 8255914: [AOT] Using AOT flag should give warning when AOT is not included in build
 - 8219014: (bf) Add absolute bulk put methods which accept a source Buffer
 - 8255452: Doing GC during JVMTI MethodExit event posting breaks return oop
 - 8250637: UseOSErrorReporting times out (on Mac and Linux)
 - 8255847: Shenandoah: Shenandoah should not mark through weak roots
 - 8255214: Unsupported 'valign' attribute for 'th' tag used in j.u.l.LogManager
 - ... and 124 more: https://git.openjdk.java.net/amber/compare/5782a2a3...e66fd6f0

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

Changes: https://git.openjdk.java.net/amber/pull/69/files
  Stats: 14388 lines in 806 files changed: 7747 ins; 4039 del; 2602 mod
  Patch: https://git.openjdk.java.net/amber/pull/69.diff
  Fetch: git fetch https://git.openjdk.java.net/amber pull/69/head:pull/69

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


More information about the amber-dev mailing list