extend task comm from 16 to 24 for CONFIG_BASE_FULL

[kernel-patches-bot]

Pull request for series with
subject: extend task comm from 16 to 24 for CONFIG_BASE_FULL
version: 5
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=567457

[kernel-patches-bot]

Master branch: db5b6a4
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=567457
version: 5

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: fs/exec: make __set_task_comm always set a nul ternimated string
Applying: fs/exec: make __get_task_comm always get a nul terminated string
Applying: sched.h: introduce TASK_COMM_LEN_16
Applying: cn_proc: make connector comm always nul ternimated
Applying: drivers/infiniband: make setup_ctxt always get a nul terminated task comm
Applying: elfcore: make prpsinfo always get a nul terminated task comm
Applying: samples/bpf/kern: use TASK_COMM_LEN instead of hard-coded 16
Applying: samples/bpf/user: use TASK_COMM_LEN_16 instead of hard-coded 16
Applying: tools/include: introduce TASK_COMM_LEN_16
Applying: tools/lib/perf: use TASK_COMM_LEN_16 instead of hard-coded 16
Applying: tools/bpf/bpftool: use TASK_COMM_LEN_16 instead of hard-coded 16
Using index info to reconstruct a base tree...
M	tools/bpf/bpftool/Makefile
Falling back to patching base and 3-way merge...
Auto-merging tools/bpf/bpftool/Makefile
CONFLICT (content): Merge conflict in tools/bpf/bpftool/Makefile
Patch failed at 0011 tools/bpf/bpftool: use TASK_COMM_LEN_16 instead of hard-coded 16
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/bpf/bpftool/Makefile
index 098d762e111a,33fbde84993c..000000000000
--- a/tools/bpf/bpftool/Makefile
+++ b/tools/bpf/bpftool/Makefile
@@@ -176,7 -164,9 +176,13 @@@ $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OU
  	$(QUIET_CLANG)$(CLANG) \
  		-I$(if $(OUTPUT),$(OUTPUT),.) \
  		-I$(srctree)/tools/include/uapi/ \
++<<<<<<< HEAD
 +		-I$(LIBBPF_INCLUDE) \
++=======
+ 		-I$(srctree)/tools/include/ \
+ 		-I$(LIBBPF_PATH) \
+ 		-I$(srctree)/tools/lib \
++>>>>>>> tools/bpf/bpftool: use TASK_COMM_LEN_16 instead of hard-coded 16
  		-g -O2 -Wall -target bpf -c $< -o $@ && $(LLVM_STRIP) -g $@
  
  $(OUTPUT)%.skel.h: $(OUTPUT)%.bpf.o $(BPFTOOL_BOOTSTRAP)

[kernel-patches-bot]

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