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

Author: torvalds

.mailmap

@@ -719,6 +719,7 @@ Srinivas Ramana <[email protected]> <[email protected]>
 Sriram R <[email protected]> <[email protected]>
 Sriram Yagnaraman <[email protected]> <[email protected]>
 Stanislav Fomichev <[email protected]> <[email protected]>
+Stanislav Fomichev <[email protected]> <[email protected]>
 Stefan Wahren <[email protected]> <[email protected]>
 Stéphane Witzmann <[email protected]>
 Stephen Hemminger <[email protected]> <[email protected]>

MAINTAINERS

@@ -4555,6 +4555,7 @@ BPF [NETWORKING] (tcx & tc BPF, sock_addr)
 M:	Martin KaFai Lau <[email protected]>
 M:	Daniel Borkmann <[email protected]>
 R:	John Fastabend <[email protected]>
+R:	Stanislav Fomichev <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Maintained
@@ -26967,6 +26968,7 @@ M:	David S. Miller <[email protected]>
 M:	Jakub Kicinski <[email protected]>
 M:	Jesper Dangaard Brouer <[email protected]>
 M:	John Fastabend <[email protected]>
+R:	Stanislav Fomichev <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Supported
@@ -26988,6 +26990,7 @@ M:	Björn Töpel <[email protected]>
 M:	Magnus Karlsson <[email protected]>
 M:	Maciej Fijalkowski <[email protected]>
 R:	Jonathan Lemon <[email protected]>
+R:	Stanislav Fomichev <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Maintained

tools/bpf/resolve_btfids/Makefile

@@ -17,7 +17,7 @@ endif
 
 # Overrides for the prepare step libraries.
 HOST_OVERRIDES := AR="$(HOSTAR)" CC="$(HOSTCC)" LD="$(HOSTLD)" ARCH="$(HOSTARCH)" \
-		  CROSS_COMPILE="" EXTRA_CFLAGS="$(HOSTCFLAGS)"
+		  CROSS_COMPILE="" CLANG_CROSS_FLAGS="" EXTRA_CFLAGS="$(HOSTCFLAGS)"
 
 RM      ?= rm
 HOSTCC  ?= gcc

tools/lib/bpf/btf.c

@@ -1384,20 +1384,20 @@ static struct btf *btf_parse_raw_mmap(const char *path, struct btf *base_btf)
 
 	fd = open(path, O_RDONLY);
 	if (fd < 0)
-		return libbpf_err_ptr(-errno);
+		return ERR_PTR(-errno);
 
 	if (fstat(fd, &st) < 0) {
 		err = -errno;
 		close(fd);
-		return libbpf_err_ptr(err);
+		return ERR_PTR(err);
 	}
 
 	data = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
 	err = -errno;
 	close(fd);
 
 	if (data == MAP_FAILED)
-		return libbpf_err_ptr(err);
+		return ERR_PTR(err);
 
 	btf = btf_new(data, st.st_size, base_btf, true);
 	if (IS_ERR(btf))