Skip to content

Conversation

@kwvg
Copy link
Collaborator

@kwvg kwvg commented Jan 18, 2024

@github-actions
Copy link

This pull request has conflicts, please rebase.

@github-actions
Copy link

github-actions bot commented Feb 1, 2024

This pull request has conflicts, please rebase.

@kwvg kwvg changed the title backport: merge bitcoin#20332, #20908, #20915, #21336, #21443, #21142, #21512, #20833, #21522, #21553, #24336, partial bitcoin#21606 (fuzzing harness backports: part 7) backport: merge bitcoin#20332, #20908, #21336, #21443, #21142, #21512, #20833, #21522, #21553, #24336, partial bitcoin#21606 (fuzzing harness backports: part 7) Feb 4, 2024
@kwvg kwvg marked this pull request as ready for review February 5, 2024 05:48
UdjinM6
UdjinM6 previously approved these changes Feb 5, 2024
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK

Copy link
Collaborator

Choose a reason for hiding this comment

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

21553: Need to include also bitcoin#21970 in batch:

  This bug was introduced by myself in commit eeee8f5be1d4ccfb7e237248be5c6bef45b0fbb8 (https://github.com/bitcoin/bitcoin/pull/21553)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good catch, resolved in latest push!

@kwvg kwvg changed the title backport: merge bitcoin#20332, #20908, #21336, #21443, #21142, #21512, #20833, #21522, #21553, #24336, partial bitcoin#21606 (fuzzing harness backports: part 7) backport: merge bitcoin#20332, #20908, #21336, #21443, #21142, #21512, #20833, #21522, #21553, #21970, #24336, partial bitcoin#21606 (fuzzing harness backports: part 7) Feb 5, 2024
Copy link
Collaborator

@knst knst left a comment

Choose a reason for hiding this comment

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

utACK

@kwvg kwvg requested a review from UdjinM6 February 6, 2024 07:24
@UdjinM6 UdjinM6 added this to the 20.1 milestone Feb 6, 2024
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

re-utACK

Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK for merging via merge commit

@PastaPastaPasta PastaPastaPasta merged commit 052b689 into dashpay:develop Feb 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants