Re: [PATCH 2/3] bpf: arena: use page_ref_count() instead of page_mapped() in arena_free_pages()

On 4/27/26 17:00, Alexei Starovoitov wrote:
> 
> We cannot carry the same patch in 2 trees.
> Sooner or later it will create problems for linux-next
> and issues during merge window if more changes
> are done in the same area.

Agreed.

> The only way to share a patch between trees is to
> create a stable branch and pull it into 2 trees
> then sha will be the same,

Yes, but...

> but mm tree has its own way of doing things,
> so this patch needs to stay in mm only and if no one
> should be touching adjacent lines :(

... this should also be fine even if that happens. Mark knows how to resolve
(and report) trivial conflicts in linux-next, and Linus AFAIK also prefers
to resolve conflicts to other workarounds.

The shared branch would IMHO only truly be necessary if bpf tree itself
needed to base something off on this change; for resolving trivial conflicts
it might be an overkill.