Subject: Re: [PATCH v5 2/6] bpf: refactor masks for ADJ_ROOM flags and encap validation

From: Martin KaFai Lau <[email-masked]>
Date: Mon, 27 Apr 2026 15:40:12 -0700

On Mon, Apr 20, 2026 at 11:40:47AM +0100, Nick Hudson wrote:
> @@ -3618,8 +3623,8 @@ static int bpf_skb_net_shrink(struct sk_buff *skb, u32 off, u32 len_diff,
>  {
>  	int ret;
>  
> -	if (unlikely(flags & ~(BPF_F_ADJ_ROOM_FIXED_GSO |
> -			       BPF_F_ADJ_ROOM_DECAP_L3_MASK |
> +	if (unlikely(flags & ~(BPF_F_ADJ_ROOM_DECAP_MASK |
> +			       BPF_F_ADJ_ROOM_FIXED_GSO |
>  			       BPF_F_ADJ_ROOM_NO_CSUM_RESET)))

It has conflict with a recent change. Please rebase with bpf-next/net.

pw-bot: cr