[Rev 01] RFR: Merge jdk:master

J.Duke duke at openjdk.java.net
Thu May 28 14:55:19 UTC 2020


> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 17 commits from the branch
> `jdk:master`that can **not** be merged into the branch `master`:
> The following files contains merge conflicts:
> 
> - make/autoconf/platform.m4
> - make/modules/jdk.net/Lib.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 +2:openjdk-bot-2
> $ git checkout openjdk-bot-2
> 
> # 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-2:2
> 
> _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

J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains
18 commits:

 - Merge jdk:master
 - Merge
 - 8245518: Problem list java/net/SocketOption/AfterClose.java
   
   Reviewed-by: dholmes
 - 8238592: JFR: Crash when dumping paths to gc roots on deep heaps
   
   Reviewed-by: mgronlun
 - Added tag jdk-15+24 for changeset 497fd9f9129c
 - Merge
 - 8244224: Implementation of JEP 381: Remove the Solaris and SPARC Ports
   
   Reviewed-by: alanb, bchristi, dcubed, dfuchs, eosterlund, erikj, glaubitz, ihse, iignatyev, jjiang, kbarrett, ksrini,
   kvn, naoto, prr, rriggs, serb, sspitsyn, stefank, tschatzl, valeriep, weijun, weijun
 - 8235921: jdk/jfr/event/oldobject/TestLargeRootSet.java times out with debug bits
   
   Reviewed-by: mgronlun
 - Merge
 - 8233553: [TESTBUG] JSpinner test bug4973721.java fails on MacOS
   
   Reviewed-by: psadhukhan
 - ... and 8 more: https://git.openjdk.java.net/mobile/compare/f0dc5cb9...13718c7b

/integrate

-------------

Changes: https://git.openjdk.java.net/mobile/pull/6/files
 Webrev: https://webrevs.openjdk.java.net/mobile/6/webrev.01
  Stats: 128991 lines in 988 files changed: 806 ins; 127003 del; 1182 mod
  Patch: https://git.openjdk.java.net/mobile/pull/6.diff
  Fetch: git fetch https://git.openjdk.java.net/mobile pull/6/head:pull/6

PR: https://git.openjdk.java.net/mobile/pull/6


More information about the mobile-dev mailing list