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

chore(patches): make arm64 reg allow patches apply cleanly #11886

Merged
merged 1 commit into from
Oct 31, 2023

Conversation

bungle
Copy link
Member

@bungle bungle commented Oct 30, 2023

Summary

Before:

patching file bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h
Hunk #1 succeeded at 1133 (offset 26 lines).
Hunk #2 succeeded at 1142 (offset 26 lines).

After:

patching file bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h

### Summary

Before:
```
patching file bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h
Hunk #1 succeeded at 1133 (offset 26 lines).
Hunk #2 succeeded at 1142 (offset 26 lines).
```

After:
```
patching file bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h
```

Signed-off-by: Aapo Talvensaari <aapo.talvensaari@gmail.com>
@bungle
Copy link
Member Author

bungle commented Oct 30, 2023

(not strictly necessary for 3.5)

@AndyZhang0707 AndyZhang0707 removed this from the 3.5.0 milestone Oct 31, 2023
@AndyZhang0707
Copy link
Collaborator

Removed the 3.5.0 milestone as it's not needed for 3.5.0

@bungle bungle merged commit dda623d into master Oct 31, 2023
35 checks passed
@bungle bungle deleted the chore/patches-lj-arm64-reg-alloc branch October 31, 2023 09:02
team-gateway-bot pushed a commit that referenced this pull request Oct 31, 2023
### Summary

Before:
```
patching file bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h
Hunk #1 succeeded at 1133 (offset 26 lines).
Hunk #2 succeeded at 1142 (offset 26 lines).
```

After:
```
patching file bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h
```

Signed-off-by: Aapo Talvensaari <aapo.talvensaari@gmail.com>
(cherry picked from commit dda623d)
dndx pushed a commit that referenced this pull request Nov 9, 2023
### Summary

Before:
```
patching file bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h
Hunk #1 succeeded at 1133 (offset 26 lines).
Hunk #2 succeeded at 1142 (offset 26 lines).
```

After:
```
patching file bundle/LuaJIT-2.1-20230410/src/lj_asm_arm64.h
```

Signed-off-by: Aapo Talvensaari <aapo.talvensaari@gmail.com>
(cherry picked from commit dda623d)
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.

3 participants