tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull BPF fixes from Alexei Starovoitov

- Fix libbpf backward compatibility (Andrii Nakryiko)

- Add Stanislav Fomichev as bpf/net reviewer

- Fix resolve_btfid build when cross compiling (Suleiman Souhlal)

* tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
MAINTAINERS: Add myself as bpf networking reviewer
tools/resolve_btfids: Fix build when cross compiling kernel with clang.
libbpf: Handle unsupported mmap-based /sys/kernel/btf/vmlinux correctly

Linus Torvalds 2c4a1f3f 403d1338

+8 -4
+1
.mailmap
··· 719 719 Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org> 720 720 Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech> 721 721 Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com> 722 + Stanislav Fomichev <sdf@fomichev.me> <stfomichev@gmail.com> 722 723 Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com> 723 724 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr> 724 725 Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>
+3
MAINTAINERS
··· 4555 4555 M: Martin KaFai Lau <martin.lau@linux.dev> 4556 4556 M: Daniel Borkmann <daniel@iogearbox.net> 4557 4557 R: John Fastabend <john.fastabend@gmail.com> 4558 + R: Stanislav Fomichev <sdf@fomichev.me> 4558 4559 L: bpf@vger.kernel.org 4559 4560 L: netdev@vger.kernel.org 4560 4561 S: Maintained ··· 26968 26967 M: Jakub Kicinski <kuba@kernel.org> 26969 26968 M: Jesper Dangaard Brouer <hawk@kernel.org> 26970 26969 M: John Fastabend <john.fastabend@gmail.com> 26970 + R: Stanislav Fomichev <sdf@fomichev.me> 26971 26971 L: netdev@vger.kernel.org 26972 26972 L: bpf@vger.kernel.org 26973 26973 S: Supported ··· 26990 26988 M: Magnus Karlsson <magnus.karlsson@intel.com> 26991 26989 M: Maciej Fijalkowski <maciej.fijalkowski@intel.com> 26992 26990 R: Jonathan Lemon <jonathan.lemon@gmail.com> 26991 + R: Stanislav Fomichev <sdf@fomichev.me> 26993 26992 L: netdev@vger.kernel.org 26994 26993 L: bpf@vger.kernel.org 26995 26994 S: Maintained
+1 -1
tools/bpf/resolve_btfids/Makefile
··· 17 17 18 18 # Overrides for the prepare step libraries. 19 19 HOST_OVERRIDES := AR="$(HOSTAR)" CC="$(HOSTCC)" LD="$(HOSTLD)" ARCH="$(HOSTARCH)" \ 20 - CROSS_COMPILE="" EXTRA_CFLAGS="$(HOSTCFLAGS)" 20 + CROSS_COMPILE="" CLANG_CROSS_FLAGS="" EXTRA_CFLAGS="$(HOSTCFLAGS)" 21 21 22 22 RM ?= rm 23 23 HOSTCC ?= gcc
+3 -3
tools/lib/bpf/btf.c
··· 1384 1384 1385 1385 fd = open(path, O_RDONLY); 1386 1386 if (fd < 0) 1387 - return libbpf_err_ptr(-errno); 1387 + return ERR_PTR(-errno); 1388 1388 1389 1389 if (fstat(fd, &st) < 0) { 1390 1390 err = -errno; 1391 1391 close(fd); 1392 - return libbpf_err_ptr(err); 1392 + return ERR_PTR(err); 1393 1393 } 1394 1394 1395 1395 data = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); ··· 1397 1397 close(fd); 1398 1398 1399 1399 if (data == MAP_FAILED) 1400 - return libbpf_err_ptr(err); 1400 + return ERR_PTR(err); 1401 1401 1402 1402 btf = btf_new(data, st.st_size, base_btf, true); 1403 1403 if (IS_ERR(btf))