Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support vector-units w/o L1D$ access (copy #3537) #3540

Merged
merged 4 commits into from
Jan 4, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 25, 2023

This is an automatic copy of pull request #3537 done by Mergify.
Cherry-pick of 5bef59a has failed:

On branch mergify/copy/master/pr-3537
Your branch is ahead of 'origin/master' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 5bef59a8c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/main/scala/tile/BaseTile.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/main/scala/tile/Core.scala

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit df66c19)
(cherry picked from commit 74dd9b1)
(cherry picked from commit 5bef59a)

# Conflicts:
#	src/main/scala/tile/Core.scala
@mergify mergify bot added the conflicts label Nov 25, 2023
@jerryz123 jerryz123 closed this Nov 25, 2023
@mergify mergify bot deleted the mergify/copy/master/pr-3537 branch November 25, 2023 09:09
@jerryz123 jerryz123 restored the mergify/copy/master/pr-3537 branch November 25, 2023 09:41
@jerryz123 jerryz123 reopened this Nov 25, 2023
@jerryz123
Copy link
Contributor

@Mergifyio rebase master

Copy link
Contributor Author

mergify bot commented Nov 25, 2023

rebase master

☑️ Nothing to do

  • -conflict [:pushpin: rebase requirement]
  • -closed [:pushpin: rebase requirement]

@jerryz123 jerryz123 merged commit 1850695 into master Jan 4, 2024
26 checks passed
@jerryz123 jerryz123 deleted the mergify/copy/master/pr-3537 branch January 4, 2024 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants