From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Nov 2024 17:14:19 +0000 (-0800)
Subject: Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
X-Git-Tag: microblaze-v6.16~715
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=9f8e716d46c68112484a23d1742d9ec725e082fc;p=linux-2.6-microblaze.git

Merge tag 'bpf-fixes' of git://git./linux/kernel/git/bpf/bpf

Pull bpf fixes from Daniel Borkmann:

 - Fix a mismatching RCU unlock flavor in bpf_out_neigh_v6 (Jiawei Ye)

 - Fix BPF sockmap with kTLS to reject vsock and unix sockets upon kTLS
   context retrieval (Zijian Zhang)

 - Fix BPF bits iterator selftest for s390x (Hou Tao)

* tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  bpf: Fix mismatched RCU unlock flavour in bpf_out_neigh_v6
  bpf: Add sk_is_inet and IS_ICSK check in tls_sw_has_ctx_tx/rx
  selftests/bpf: Use -4095 as the bad address for bits iterator
---

9f8e716d46c68112484a23d1742d9ec725e082fc