[28.x] Backports #31648

pull fanquake wants to merge 5 commits into bitcoin:28.x from fanquake:28_x_backports changing 8 files +44 −55
  1. fanquake commented at 3:12 pm on January 13, 2025: member
  2. doc: upgrade license to 2025.
    Github-Pull: #31611
    Rebased-From: b537a2c02a9921235d1ecf8c3c7dc1836ec68131
    4e7dd0ac20
  3. depends: Fix spacing issue
    This change resolves an issue where a missing space caused the value of
    the `build_AR` variable to be concatenated with the "NM=" string. This
    resulted in subsequent calls to `${AR}` and `${NM}` failing.
    
    Github-Pull: #31627
    Rebased-From: 8a46286da667d19414c30350df48ebf245589e32
    f676da82fa
  4. tracing: Rename the `MIN` macro to `_TRACEPOINT_TEST_MIN` in log_raw_p2p_msgs
    Inspired by: 00c1dbd26ddb816e5541c5724397015a92a3d06b (#31419)
    
    Github-Pull: #31623
    Rebased-From: f93f0c93961bbce413101c2a92300a7a29277506
    2829588882
  5. fanquake added this to the milestone 28.2 on Jan 13, 2025
  6. DrahtBot commented at 3:12 pm on January 13, 2025: contributor

    The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

    Code Coverage & Benchmarks

    For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/31648.

    Reviews

    See the guideline for information on the review process.

    Type Reviewers
    ACK stickies-v, willcl-ark

    If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

  7. DrahtBot added the label Backport on Jan 13, 2025
  8. luke-jr commented at 9:15 pm on January 14, 2025: member
    #31623 is a clean merge to both branches, so no need for a cherry-pick here
  9. fanquake force-pushed on Feb 25, 2025
  10. DrahtBot added the label CI failed on Feb 25, 2025
  11. fanquake marked this as ready for review on Mar 5, 2025
  12. fanquake requested review from willcl-ark on Mar 5, 2025
  13. fanquake requested review from stickies-v on Mar 5, 2025
  14. willcl-ark approved
  15. willcl-ark commented at 12:41 pm on March 5, 2025: member

    ACK 77c13c7d3e68464555c6e9a049782674bcd9ea67

    All commits look good to me.

    I guess the commit title “[WIP] Update release notes” gets updated later during finalisation?

  16. fanquake force-pushed on Mar 5, 2025
  17. fanquake commented at 1:21 pm on March 5, 2025: member
    @willcl-ark I’ve just changed it here.
  18. stickies-v approved
  19. stickies-v commented at 1:45 pm on March 5, 2025: contributor

    ACK 2c372fcd5fe4f38aafa7095b990b8b805ee41ab7

    All backports are clean, except;

    • 4e7dd0ac2079dc04005c2d226eab9566807f146d backported from b537a2c02a9921235d1ecf8c3c7dc1836ec68131 (due to switching to CMake), looks okay to me

    Backports seem sensible.

    nit:

    • #31611 missing from PR description
    • dd32974dda0782798bf0e0b61f32aef745302663 doesn’t have the Github-Pull and Rebased-From metadata
    • commit authors 0xB10C and kehiy missing from release notes
  20. DrahtBot requested review from willcl-ark on Mar 5, 2025
  21. depends: Fix compiling `libevent` package on NetBSD
    Github-Pull: #31500
    Rebased-From: f89f16846ec02942e7b81d24a85e3f40941e5426
    51fbcba682
  22. willcl-ark approved
  23. willcl-ark commented at 1:49 pm on March 5, 2025: member
    ACK 2c372fcd5fe4f38aafa7095b990b8b805ee41ab7
  24. doc: Update release notes e57359c7dd
  25. fanquake force-pushed on Mar 5, 2025
  26. stickies-v approved
  27. stickies-v commented at 2:25 pm on March 5, 2025: contributor
    ACK e57359c7dd75283363b5f82675531af167742da5
  28. DrahtBot requested review from willcl-ark on Mar 5, 2025
  29. willcl-ark approved
  30. willcl-ark commented at 3:05 pm on March 5, 2025: member

    ACK e57359c7dd75283363b5f82675531af167742da5

    Now with nits addressed.

  31. glozow merged this on Mar 5, 2025
  32. glozow closed this on Mar 5, 2025

  33. fanquake deleted the branch on Mar 5, 2025

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2025-03-09 21:13 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me