Build output clean up

[kernel-patches-bot]

Pull request for series with
subject: Build output clean up
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=696196

[kernel-patches-bot]

Upstream branch: 47df8a2
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=696196
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=696196
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: tools lib api: clean up install_headers
Using index info to reconstruct a base tree...
M	tools/lib/api/Makefile
Falling back to patching base and 3-way merge...
Auto-merging tools/lib/api/Makefile
CONFLICT (content): Merge conflict in tools/lib/api/Makefile
Patch failed at 0001 tools lib api: clean up install_headers
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc tools/lib/api/Makefile
index e21e1b40b525,3649c7f7ea65..000000000000
--- a/tools/lib/api/Makefile
+++ b/tools/lib/api/Makefile
@@@ -58,6 -81,35 +58,38 @@@ $(API_IN): FORC
  $(LIBFILE): $(API_IN)
  	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(API_IN)
  
++<<<<<<< HEAD
++=======
+ define do_install_mkdir
+ 	if [ ! -d '$(DESTDIR_SQ)$1' ]; then             \
+ 		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$1'; \
+ 	fi
+ endef
+ 
+ define do_install
+ 	if [ ! -d '$(DESTDIR_SQ)$2' ]; then             \
+ 		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \
+ 	fi;                                             \
+ 	$(INSTALL) $1 $(if $3,-m $3,) '$(DESTDIR_SQ)$2'
+ endef
+ 
+ install_lib: $(LIBFILE)
+ 	$(call QUIET_INSTALL, $(LIBFILE)) \
+ 		$(call do_install_mkdir,$(libdir_SQ)); \
+ 		cp -fpR $(LIBFILE) $(DESTDIR)$(libdir_SQ)
+ 
+ install_headers:
+ 	$(call QUIET_INSTALL, libapi_headers) \
+ 		$(call do_install,cpu.h,$(prefix)/include/api,644); \
+ 		$(call do_install,debug.h,$(prefix)/include/api,644); \
+ 		$(call do_install,io.h,$(prefix)/include/api,644); \
+ 		$(call do_install,fd/array.h,$(prefix)/include/api/fd,644); \
+ 		$(call do_install,fs/fs.h,$(prefix)/include/api/fs,644); \
+ 		$(call do_install,fs/tracing_path.h,$(prefix)/include/api/fs,644);
+ 
+ install: install_lib install_headers
+ 
++>>>>>>> tools lib api: clean up install_headers
  clean:
  	$(call QUIET_CLEAN, libapi) $(RM) $(LIBFILE); \
  	find $(or $(OUTPUT),.) -name \*.o -or -name \*.o.cmd -or -name \*.o.d | xargs $(RM)

[kernel-patches-bot]

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=696196 irrelevant now. Closing PR.