RFR: Merge jdk:master

J.Duke duke at openjdk.java.net
Wed Dec 2 03:04:21 UTC 2020

Hi all,

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

The following file contains merge conflicts:

- src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m

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

# Ensure target branch is up to date
$ git checkout master
$ git pull https://github.com/openjdk/lanai.git master

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

# Merge the target branch
$ git merge master

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 jdk: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/lanai.git openjdk-bot-6:6

_Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.

J. Duke


Commit messages:
 - 8257434: jpackage fails to create rpm on Fedora Linux
 - 8257232: CompileThresholdScaling fails to work on 32-bit platforms
 - 8257537: [vector] Cleanup redundant bitwise cases on floating point vectors
 - 8210253: Clipped UI rendering with X11 pipeline and HiDPI
 - 8257190: simplify PhaseIdealLoop constructors
 - 8256474: Migrate Mutex _owner accesses to use Atomic operations
 - 8257511: JDK-8254082 brings regression to AbstractStringBuilder.insert(int dstOffset, CharSequence s, int start, int end)
 - 8257460: Further CompilerOracle cleanup
 - 8255968: Confusing error message for inaccessible constructor
 - 8246739: InputStream.skipNBytes could be implemented more efficiently
 - ... and 18 more: https://git.openjdk.java.net/lanai/compare/7d898524...541c7f74

The webrev contains the conflicts with master:
 - merge conflicts: https://webrevs.openjdk.java.net/?repo=lanai&pr=136&range=00.conflicts

Changes: https://git.openjdk.java.net/lanai/pull/136/files
  Stats: 4016 lines in 176 files changed: 3024 ins; 385 del; 607 mod
  Patch: https://git.openjdk.java.net/lanai/pull/136.diff
  Fetch: git fetch https://git.openjdk.java.net/lanai pull/136/head:pull/136

PR: https://git.openjdk.java.net/lanai/pull/136

More information about the lanai-dev mailing list