Resolve merge conflicts

linuxkerneltravel · Jul 12, 2024 · 66cf7f4 · 66cf7f4
2 parents 134eb5e + 29346db
commit 66cf7f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/eBPF_Supermarket/CPU_Subsystem/cpu_watcher/bpf/mutrace.bpf.c b/eBPF_Supermarket/CPU_Subsystem/cpu_watcher/bpf/mutrace.bpf.c
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// author: zhangxy1016304@163.com 
+// author: albert_xuu@163.com zhangxy1016304@163.com zhangziheng0525@163.com
 
 #include <vmlinux.h>
 #include <bpf/bpf_helpers.h>
@@ -190,4 +190,4 @@ int BPF_KPROBE(trace_mutex_unlock, struct mutex *lock) {
 // SEC("uprobe")
 // int BPF_KPROBE(pthread_mutex_destroy,void *__mutex){
 
-// }
+// }
diff --git a/eBPF_Supermarket/CPU_Subsystem/cpu_watcher/cpu_watcher.c b/eBPF_Supermarket/CPU_Subsystem/cpu_watcher/cpu_watcher.c
@@ -1193,4 +1193,4 @@ int main(int argc, char **argv)
 	ring_buffer__free(rb);
 	mutrace_bpf__destroy(mu_skel);
 	return err < 0 ? -err : 0;
-}
+}