diff --git a/.mailmap b/.mailmap
index 912213cf..b27dc61f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,8 @@
 Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
+Fangrui Song <i@maskray.me> <maskray@google.com>
 Geliang Tang <geliang@kernel.org> <geliang.tang@suse.com>
 Herbert Xu <herbert@gondor.apana.org.au>
+Jesper Dangaard Brouer <hawk@kernel.org> <brouer@redhat.com>
 Kees Cook <kees@kernel.org> <keescook@chromium.org>
 Maxim Mikityanskiy <maxtram95@gmail.com> <maximmi@nvidia.com>
 Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>
diff --git a/BPF-CHECKPOINT-COMMIT b/BPF-CHECKPOINT-COMMIT
index 6e5e8dcd..0c39fee6 100644
--- a/BPF-CHECKPOINT-COMMIT
+++ b/BPF-CHECKPOINT-COMMIT
@@ -1 +1 @@
-b836cbdf3b81a4a22b3452186efa2e5105a77e10
+d5fb316e2af1d947f0f6c3666e373a54d9f27c6f
diff --git a/CHECKPOINT-COMMIT b/CHECKPOINT-COMMIT
index 83de0ab2..5dd49d8f 100644
--- a/CHECKPOINT-COMMIT
+++ b/CHECKPOINT-COMMIT
@@ -1 +1 @@
-989a29cfed9b5092c3e18be14e9032c51bb1c9f6
+c6fb8030b4baa01c850f99fc6da051b1017edc46
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index a7eee689..f28b6527 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1121,6 +1121,9 @@ enum bpf_attach_type {
 
 #define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE
 
+/* Add BPF_LINK_TYPE(type, name) in bpf_types.h to keep bpf_link_type_strs[]
+ * in sync with the definitions below.
+ */
 enum bpf_link_type {
 	BPF_LINK_TYPE_UNSPEC = 0,
 	BPF_LINK_TYPE_RAW_TRACEPOINT = 1,
diff --git a/libbpf b/libbpf
index fc064eb4..09b9e831 160000
--- a/libbpf
+++ b/libbpf
@@ -1 +1 @@
-Subproject commit fc064eb41e9de925beaeaf5b656ecf0f5ff83c08
+Subproject commit 09b9e83102eb8ab9e540d36b4559c55f3bcdb95d