diff options
| author |   Martin KaFai Lau <martin.lau@kernel.org> | 2025-09-04 21:22:00 -0700 |
|---|---|---|
| committer | Martin KaFai Lau <martin.lau@kernel.org> | 2025-09-04 21:22:00 -0700 |
| commit | 2dfd8b8de66d9b0ef16d089e4d4525acf2a59cb2 (patch) | |
| tree | 754bdd0072da3c133995a6bfab64eb0d60232f89 /include/uapi/linux/android/ssh:/git@git.zx2c4.com | |
| parent | idpf: do not linearize big TSO packets (diff) | |
| parent | bpf: Return an error pointer for skb metadata when CONFIG_NET=n (diff) | |
Merge branch 'bpf-next/skb-meta-dynptr' into 'bpf-next/net'
Merge skb-meta-dynptr branch into net branch after fixing a compiler
warning. No conflict.
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Diffstat (limited to 'include/uapi/linux/android/ssh:/git@git.zx2c4.com')
0 files changed, 0 insertions, 0 deletions