On Mon, Feb 24, 2025 at 6:54 PM Lei Yang [off-list ref] wrote:

Hi Mina

I'd like to test this series of patches because these changes are network-related. But there was some conflict when I tried to apply this feature. Could you please help review it.
The latest commit id which I tested is following:
# git log
commit d082ecbc71e9e0bf49883ee4afd435a77a5101b6 (HEAD -> master, tag: v6.14-rc4, origin/master, origin/HEAD)
Author: Linus Torvalds [off-list ref]
Date:   Sun Feb 23 12:32:57 2025 -0800

    Linux 6.14-rc4

About conflict content please review attachment.

Thanks Lei,

Did you just want me to review the code in the attached file to make
sure it looks good or was there a merge conflict with some repro steps
that you wanted me to look at? Or you do have a diff of the conflict
you want me to resolve?

The attached file in your email looks like an exact copy of my first
patch in the series,  "[PATCH net-next v5 1/9] net: add
get_netmem/put_netmem support", so it looks good to me.

-- 
Thanks,
Mina