gendwarfksyms: order -T symtypes output by name

[modules-kpd-app]

Pull request for series with
subject: gendwarfksyms: order -T symtypes output by name
version: 1
url: https://patchwork.kernel.org/project/linux-modules/list/?series=975692

[modules-kpd-app]

Upstream branch: a0b018a
series: https://patchwork.kernel.org/project/linux-modules/list/?series=975692
version: 1

[modules-kpd-app]

Upstream branch: a0b018a
series: https://patchwork.kernel.org/project/linux-modules/list/?series=975692
version: 1

[modules-kpd-app]

Upstream branch: a0b018a
series: https://patchwork.kernel.org/project/linux-modules/list/?series=975692
version: 1

[modules-kpd-app]

Upstream branch: 5eb4b9a
series: https://patchwork.kernel.org/project/linux-modules/list/?series=975692
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-modules/list/?series=975692
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: gendwarfksyms: order -T symtypes output by name
Using index info to reconstruct a base tree...
M	scripts/gendwarfksyms/types.c
Falling back to patching base and 3-way merge...
Auto-merging scripts/gendwarfksyms/types.c
CONFLICT (content): Merge conflict in scripts/gendwarfksyms/types.c
Patch failed at 0001 gendwarfksyms: order -T symtypes output by name'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"'

conflict:

diff --cc scripts/gendwarfksyms/types.c
index 9c3b053bf061,51c1471e8684..000000000000
--- a/scripts/gendwarfksyms/types.c
+++ b/scripts/gendwarfksyms/types.c
@@@ -202,11 -202,11 +202,19 @@@ static void type_map_write(FILE *file
  
  	hash_for_each_safe(type_map, e, tmp, hash)
  		++count;
++<<<<<<< HEAD
 +	es = xmalloc(count * sizeof(*es));
 +	hash_for_each_safe(type_map, e, tmp, hash)
 +		es[i++] = e;
 +
 +	qsort(es, count, sizeof(*es), cmp_expansion_name);
++=======
+ 	es = xmalloc(count * sizeof(struct type_expansion *));
+ 	hash_for_each_safe(type_map, e, tmp, hash)
+ 		es[i++] = e;
+ 
+ 	qsort(es, count, sizeof(struct type_expansion *), cmp_expansion_name);
++>>>>>>> gendwarfksyms: order -T symtypes output by name
  
  	for (i = 0; i < count; ++i) {
  		checkp(fputs(es[i]->name, file));