Subject: linux-next: manual merge of the execve tree with the tip tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 7 Aug 2024 13:14:05 +1000

Hi all,

Today's linux-next merge of the execve tree got a conflict in:

  fs/binfmt_elf.c

between commit:

  ba386777a30b ("x86/elf: Add a new FPU buffer layout info to x86 core files")

from the tip tree and commit:

  fb97d2eb542f ("binfmt_elf, coredump: Log the reason of the failed core dumps")

from the execve tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/binfmt_elf.c
index 01bcbe7fdebd,bf9bfd1a0007..000000000000
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@@ -2092,20 -2102,28 +2102,28 @@@ static int elf_core_dump(struct coredum
  			phdr.p_flags |= PF_X;
  		phdr.p_align = ELF_EXEC_PAGESIZE;
  
- 		if (!dump_emit(cprm, &phdr, sizeof(phdr)))
+ 		if (!dump_emit(cprm, &phdr, sizeof(phdr))) {
+ 			coredump_report_failure("Error emitting program headers");
  			goto end_coredump;
+ 		}
  	}
  
- 	if (!elf_core_write_extra_phdrs(cprm, offset))
+ 	if (!elf_core_write_extra_phdrs(cprm, offset)) {
+ 		coredump_report_failure("Error writing out extra program headers");
  		goto end_coredump;
+ 	}
  
  	/* write out the notes section */
- 	if (!write_note_info(&info, cprm))
+ 	if (!write_note_info(&info, cprm)) {
+ 		coredump_report_failure("Error writing out notes");
  		goto end_coredump;
+ 	}
  
 -	/* For cell spufs */
 +	/* For cell spufs and x86 xstate */
- 	if (elf_coredump_extra_notes_write(cprm))
+ 	if (elf_coredump_extra_notes_write(cprm)) {
+ 		coredump_report_failure("Error writing out extra notes");
  		goto end_coredump;
+ 	}
  
  	/* Align to page */
  	dump_skip_to(cprm, dataoff);