RFR: Merge jdk:master
J.Duke
duke at openjdk.java.net
Thu Jul 2 17:10:51 UTC 2020
Hi all,
this is an _automatically_ generated pull request to notify you that there are 20 commits from the branch
`jdk:master`that can **not** be merged into the branch `master`:
The following file contains merge conflicts:
- make/common/modules/LauncherCommon.gmk
All Committers in this [project](https://openjdk.java.net/census#Optional[mobile]) have access to my [personal
fork](https://github.com/openjdk-bot/mobile) 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/mobile](https://github.com/openjdk/mobile) repository.
# Ensure target branch is up to date
$ git checkout master
$ git pull https://github.com/openjdk/mobile master
# Fetch and checkout the branch for this pull request
$ git fetch https://github.com/openjdk-bot/mobile +4:openjdk-bot-4
$ git checkout openjdk-bot-4
# 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/mobile openjdk-bot-4:4
_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:
- Added tag jdk-16+4 for changeset e2622818f0bd
- 8248321: [JVMCI] improve libgraal logging and fatal error handling
- 8248667: Need support for building native libraries located in the test/lib directory
- 8218021: Have jarsigner preserve posix permission attributes
- 8248650: [BACKOUT] Backout JDK-8244603 because it generates too much noise in CI
- 8248634: Shenandoah: incorrect include in shenandoahInitLogger.cpp
- 8248632: Shenandoah: build fails without both JVMTI and JFR
- Merge
- Added tag jdk-16+4 for changeset 78c07dd72404
- Added tag jdk-15+30 for changeset 6909e4a1f25b
- ... and 10 more: https://git.openjdk.java.net/mobile/compare/13b7c2e1...1eaa4116
The webrev contains the conflicts with master:
- merge conflicts: https://webrevs.openjdk.java.net/mobile/8/webrev.00.conflicts
Changes: https://git.openjdk.java.net/mobile/pull/8/files
Stats: 3500 lines in 82 files changed: 1676 ins; 1185 del; 639 mod
Patch: https://git.openjdk.java.net/mobile/pull/8.diff
Fetch: git fetch https://git.openjdk.java.net/mobile pull/8/head:pull/8
PR: https://git.openjdk.java.net/mobile/pull/8
More information about the mobile-dev
mailing list