Skip to content

Commit

Permalink
8319525: RISC-V: Rename *_riscv64.ad files to *_riscv.ad under riscv/gc
Browse files Browse the repository at this point in the history
Reviewed-by: luhenry, fyang
  • Loading branch information
feilongjiang committed Nov 7, 2023
1 parent bfafb27 commit b2504a0
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 0 deletions.
File renamed without changes.
File renamed without changes.

5 comments on commit b2504a0

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@RealFYang
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk21u

@openjdk
Copy link

@openjdk openjdk bot commented on b2504a0 Nov 8, 2023

Choose a reason for hiding this comment

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

@RealFYang the backport was successfully created on the branch RealFYang-backport-b2504a0f in my personal fork of openjdk/jdk21u. To create a pull request with this backport targeting openjdk/jdk21u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

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

The commit being backported was authored by Feilong Jiang on 7 Nov 2023 and was reviewed by Ludovic Henry and Fei Yang.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u:

$ git fetch https://github.com/openjdk-bots/jdk21u.git RealFYang-backport-b2504a0f:RealFYang-backport-b2504a0f
$ git checkout RealFYang-backport-b2504a0f
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u.git RealFYang-backport-b2504a0f

@feilongjiang
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 jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on b2504a0 Nov 8, 2023

Choose a reason for hiding this comment

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

@feilongjiang Could not automatically backport b2504a0f to openjdk/jdk17u-dev due to conflicts in the following files:

  • src/hotspot/cpu/riscv/gc/x/x_riscv.ad

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-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/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b feilongjiang-backport-b2504a0f

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

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

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

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

Please sign in to comment.