mirror: Update expected diff with kernel sources

A recent patch has touched some portions of bpftool's Makefile that
differ between kernel's and mirror's sources. Let's update the diff with
the expected differences accordingly, to smoothen future sync ups.

Signed-off-by: Quentin Monnet <quentin@isovalent.com>

scripts/sync-kernel-expected-diff.patch

@@ -60,7 +60,7 @@
 -		DESTDIR=$(LIBBPF_BOOTSTRAP_DESTDIR:/=) prefix= \
 +	$(Q)$(MAKE) -C $(BPF_DIR) OBJDIR=$(patsubst %/,%,$(LIBBPF_BOOTSTRAP_OUTPUT)) \
 +		PREFIX=$(LIBBPF_BOOTSTRAP_DESTDIR:/=) \
- 		ARCH= CROSS_COMPILE= CC=$(HOSTCC) LD=$(HOSTLD) AR=$(HOSTAR) $@ install_headers
+ 		ARCH= CROSS_COMPILE= CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" $@ install_headers
 
  $(LIBBPF_BOOTSTRAP_INTERNAL_HDRS): $(LIBBPF_BOOTSTRAP_HDRS_DIR)/%.h: $(BPF_DIR)/%.h | $(LIBBPF_BOOTSTRAP_HDRS_DIR)
 @@ -76,9 +74,9 @@
@@ -76,7 +76,7 @@
  ifneq ($(BPFTOOL_VERSION),)
  CFLAGS += -DBPFTOOL_VERSION='"$(BPFTOOL_VERSION)"'
  endif
-@@ -107,11 +105,7 @@
+@@ -119,11 +117,7 @@
  endif
 
  ifeq ($(check_feat),1)
@@ -88,17 +88,17 @@
 +include Makefile.feature
  endif
 
- ifeq ($(feature-disassembler-four-args), 1)
-@@ -181,7 +175,7 @@
+ LIBS = $(LIBBPF) -lelf -lz
+@@ -213,7 +207,7 @@
  $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUTPUT)vmlinux.h $(LIBBPF_BOOTSTRAP)
  	$(QUIET_CLANG)$(CLANG) \
  		-I$(or $(OUTPUT),.) \
 -		-I$(srctree)/tools/include/uapi/ \
 +		-I$(srctree)/include/uapi/ \
  		-I$(LIBBPF_BOOTSTRAP_INCLUDE) \
- 		-g -O2 -Wall -target bpf -c $< -o $@
- 	$(Q)$(LLVM_STRIP) -g $@
-@@ -198,10 +192,10 @@
+ 		-g -O2 -Wall -fno-stack-protector \
+ 		-target bpf -c $< -o $@
+@@ -231,10 +225,10 @@
 
  CFLAGS += $(if $(BUILD_BPF_SKELS),,-DBPFTOOL_WITHOUT_SKELETONS)
 
@@ -110,8 +110,8 @@
 +$(OUTPUT)disasm.o: $(srctree)/src/kernel/bpf/disasm.c
  	$(QUIET_CC)$(CC) $(CFLAGS) -c -MMD $< -o $@
 
- $(OUTPUT)feature.o:
-@@ -225,7 +219,7 @@
+ $(BPFTOOL_BOOTSTRAP): $(BOOTSTRAP_OBJS) $(LIBBPF_BOOTSTRAP)
+@@ -253,7 +247,7 @@
  	$(call QUIET_CLEAN, feature-detect)
  	$(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
 
@@ -120,7 +120,7 @@
  	$(call QUIET_CLEAN, bpftool)
  	$(Q)$(RM) -- $(OUTPUT)bpftool $(OUTPUT)*.o $(OUTPUT)*.d
  	$(Q)$(RM) -- $(OUTPUT)*.skel.h $(OUTPUT)vmlinux.h
-@@ -241,7 +235,7 @@
+@@ -269,7 +263,7 @@
 
  install: install-bin
  	$(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(bash_compdir)
@@ -129,7 +129,7 @@
 
  uninstall:
  	$(call QUIET_UNINST, bpftool)
-@@ -249,16 +243,16 @@
+@@ -277,16 +271,16 @@
  	$(Q)$(RM) -- $(DESTDIR)$(bash_compdir)/bpftool
 
  doc: