Skip to content

Commit

Permalink
8344164: [s390x] ProblemList hotspot/jtreg/runtime/NMT/VirtualAllocCo…
Browse files Browse the repository at this point in the history 
…mmitMerge.java

Reviewed-by: lucy
  • Loading branch information
@offamitkumar
offamitkumar committed Nov 15, 2024
1 parent 5e27608 commit 3245f56
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions test/hotspot/jtreg/ProblemList.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ runtime/cds/appcds/customLoader/HelloCustom_JFR.java 8241075 linux-all,windows-x
runtime/Dictionary/CleanProtectionDomain.java 8341916 generic-all
runtime/Dictionary/ProtectionDomainCacheTest.java 8341916 generic-all
runtime/logging/ProtectionDomainVerificationTest.java 8341916 generic-all
runtime/NMT/VirtualAllocCommitMerge.java 8309698 linux-s390x

# Fails with +UseCompactObjectHeaders on aarch64
runtime/cds/appcds/SharedBaseAddress.java 8340212 linux-aarch64,macosx-aarch64
Expand Down

5 comments on commit 3245f56

@offamitkumar
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk23u

@offamitkumar
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 3245f56 Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@offamitkumar Could not automatically backport 3245f56e to openjdk/jdk23u due to conflicts in the following files:

  • test/hotspot/jtreg/ProblemList.txt

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk23u. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk23u.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-offamitkumar-3245f56e-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 3245f56e53792b3cfc9788799ba1594d6af15bea

# Backport the commit
$ git cherry-pick --no-commit 3245f56e53792b3cfc9788799ba1594d6af15bea
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 3245f56e53792b3cfc9788799ba1594d6af15bea'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk23u with the title Backport 3245f56e53792b3cfc9788799ba1594d6af15bea.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 3245f56e from the openjdk/jdk repository.

The commit being backported was authored by Amit Kumar on 15 Nov 2024 and was reviewed by Lutz Schmidt.

Thanks!

@openjdk
Copy link

@openjdk openjdk bot commented on 3245f56 Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@offamitkumar Could not automatically backport 3245f56e to openjdk/jdk21u-dev due to conflicts in the following files:

  • test/hotspot/jtreg/ProblemList.txt

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk21u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk21u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-offamitkumar-3245f56e-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 3245f56e53792b3cfc9788799ba1594d6af15bea

# Backport the commit
$ git cherry-pick --no-commit 3245f56e53792b3cfc9788799ba1594d6af15bea
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 3245f56e53792b3cfc9788799ba1594d6af15bea'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk21u-dev with the title Backport 3245f56e53792b3cfc9788799ba1594d6af15bea.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 3245f56e from the openjdk/jdk repository.

The commit being backported was authored by Amit Kumar on 15 Nov 2024 and was reviewed by Lutz Schmidt.

Thanks!

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

Please sign in to comment.