Merge main into next about fastify HOT 4 CLOSED

can you do it today?

It's already synced. before I comment.

from fastify.

The difference between the branches is growing larger and larger

Not that large than I thought.

it already requires a careful rebase/merge — there are conflicts

Conflict always there if you are working on two branch, you may also see the same when backporting.

I don't have access and even if I did, I don't know if pushing directly is the right way to do it

For me, what it does is the same as sending PR. Reviewing the merge conflict or that large amount of commits is not feasible.
We may try to do in PR approach, but I assume it unlikely be reviewed. Or it may just be direct merge when unit test pass.

from fastify.

Okay I agree that direct merge is easier, can you do it today?

Because I want to merge #5419 but if we do it before rebaseing/merging from main, the conflicts will increase

Would you want to do it after or before #5419?

from fastify.

Thanks

from fastify.