diff --git a/BPF-CHECKPOINT-COMMIT b/BPF-CHECKPOINT-COMMIT
index 8fb5e1e9..31b970e9 100644
--- a/BPF-CHECKPOINT-COMMIT
+++ b/BPF-CHECKPOINT-COMMIT
@@ -1 +1 @@
-5bcf0dcbf9066348058b88a510c57f70f384c92c
+3e9bc0472b910d4115e16e9c2d684c7757cb6c60
diff --git a/CHECKPOINT-COMMIT b/CHECKPOINT-COMMIT
index c780583d..0e3fb521 100644
--- a/CHECKPOINT-COMMIT
+++ b/CHECKPOINT-COMMIT
@@ -1 +1 @@
-82e38a505c9868e784ec31e743fd8a9fa5ca1084
+009367099eb61a4fc2af44d4eb06b6b4de7de6db
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index e4ae8355..90706a47 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1115,6 +1115,7 @@ enum bpf_attach_type {
 	BPF_CGROUP_UNIX_GETSOCKNAME,
 	BPF_NETKIT_PRIMARY,
 	BPF_NETKIT_PEER,
+	BPF_TRACE_KPROBE_SESSION,
 	__MAX_BPF_ATTACH_TYPE
 };
 
@@ -6947,6 +6948,8 @@ enum {
 					 * socket transition to LISTEN state.
 					 */
 	BPF_SOCK_OPS_RTT_CB,		/* Called on every RTT.
+					 * Arg1: measured RTT input (mrtt)
+					 * Arg2: updated srtt
 					 */
 	BPF_SOCK_OPS_PARSE_HDR_OPT_CB,	/* Parse the header option.
 					 * It will be called to handle
diff --git a/libbpf b/libbpf
index 2fdcc365..02724cfd 160000
--- a/libbpf
+++ b/libbpf
@@ -1 +1 @@
-Subproject commit 2fdcc365a0c5253314644b8e27b02cf4affecbed
+Subproject commit 02724cfd0702c4102138e62c3ae7d2721c7b190e
diff --git a/src/Makefile b/src/Makefile
index d48d22ff..85f19bc9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -141,7 +141,7 @@ ifeq ($(feature-llvm),1)
   # If LLVM is available, use it for JIT disassembly
   CFLAGS  += -DHAVE_LLVM_SUPPORT
   LLVM_CONFIG_LIB_COMPONENTS := mcdisassembler all-targets
-  CFLAGS  += $(shell $(LLVM_CONFIG) --cflags --libs $(LLVM_CONFIG_LIB_COMPONENTS))
+  CFLAGS  += $(shell $(LLVM_CONFIG) --cflags)
   LIBS    += $(shell $(LLVM_CONFIG) --libs $(LLVM_CONFIG_LIB_COMPONENTS))
   ifeq ($(shell $(LLVM_CONFIG) --shared-mode),static)
     LIBS += $(shell $(LLVM_CONFIG) --system-libs $(LLVM_CONFIG_LIB_COMPONENTS))