mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
b359042d4d
rebase xdp-tools from upstream xdp-tools 1.5.4. there is Makefile conflict when rebase because 1.5.4 added xdp-forward. manually resolve the rebase conflict by put loongfire xdp program at the end: for example instruction from deepseek: Open the Makefile in a text editor and locate the conflict: makefile ifneq ($(BPFTOOL),) <<<<<<< HEAD UTILS += xdp-bench xdp-forward xdp-monitor xdp-trafficgen ======= UTILS += xdp-bench xdp-monitor xdp-trafficgen xdp-synproxy >>>>>>> d8ebb16 (Add xdp-synproxy) endif Understand the conflict: The HEAD (upstream/main) version includes xdp-forward. Your commit (d8ebb16) adds xdp-synproxy but removes xdp-forward. Resolve the conflict by including both changes: Keep xdp-forward from HEAD. Add xdp-synproxy from your commit. The merged line should look like this: makefile UTILS += xdp-bench xdp-forward xdp-monitor xdp-trafficgen xdp-synproxy Remove the conflict markers (<<<<<<<, =======, >>>>>>>). edit result: ifneq ($(BPFTOOL),) UTILS += xdp-bench xdp-forward xdp-monitor xdp-trafficgen xdp-synproxy endif Save the file after making these changes. Stage the resolved Makefile and continue the rebase: git add Makefile git rebase --continue repeat editing Makefile and git rebase --continue for below program xdp-dnsrrl xdp-udp xdp-dns xdp-sni xdp-geoip xdp-udpddos xdp-tailcall xdp-synproxy-tailcall xdp-ddos Signed-off-by: Vincent Li <vincent.mc.li@gmail.com>