From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Apr 2025 18:55:41 +0000 (-0700)
Subject: Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
X-Git-Tag: v6.15-rc1~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=531a62f223d2f4c0d01df3b3387f0836b5006256;p=thirdparty%2Flinux.git

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

Pull bpf fixes from Alexei Starovoitov:

 - Fix BPF selftests expectations of assembler output and struct layout
   (Song Liu and Yonghong Song)

 - Fix XSK error code when queue is full (Wang Liang)

* tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  selftests/bpf: Fix verifier_private_stack test failure
  selftests/bpf: Fix verifier_bpf_fastcall test
  selftests/bpf: Fix tests after fields reorder in struct file
  xsk: Fix __xsk_generic_xmit() error code when cq is full
---

531a62f223d2f4c0d01df3b3387f0836b5006256