Merge jdk:master

[openjdk-bot]

Hi all,

this is an automatically generated pull request to notify you that there is 1 commit from the branch jdk:masterthat can not be merged into the branch master:

The following files contains merge conflicts:

• src/hotspot/os/bsd/os_perf_bsd.cpp
• src/hotspot/share/nmt/memMapPrinter.cpp

All Committers in this project have access to my personal fork 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 of the openjdk/mobile repository.

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

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

# 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-bots/mobile.git openjdk-bot-7:7

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

/integrate auto

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/mobile.git pull/33/head:pull/33
$ git checkout pull/33

Update a local copy of the PR:
$ git checkout pull/33
$ git pull https://git.openjdk.org/mobile.git pull/33/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 33

View PR using the GUI difftool:
$ git pr show -t 33

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/mobile/pull/33.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back duke! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

[openjdk]

@openjdk-bot this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 7
git fetch https://git.openjdk.org/mobile.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

[openjdk]

@openjdk-bot This pull request will be automatically integrated when it is ready

[mlbridge]

Webrevs

• 00: Merge conflicts (master) (c33c1cfe)