linux-next: manual merge of the akpm tree with the vfs tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in fs/coredump.c
between commit d9fe6ea81efe ("lift sb_start_write() out of ->write()")
from the vfs tree and commit "coredump: sanitize the setting of
signal->group_exit_code" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/coredump.c
index 69d5141,4201338..0000000
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@@ -636,11 -641,8 +639,10 @@@ void do_coredump(siginfo_t *siginfo
  		goto close_fail;
  	if (displaced)
  		put_files_struct(displaced);
+ 
 +	file_start_write(cprm.file);
- 	retval = binfmt->core_dump(&cprm);
- 	if (retval)
- 		current->signal->group_exit_code |= 0x80;
+ 	core_dumped = binfmt->core_dump(&cprm);
 +	file_end_write(cprm.file);
  
  	if (ispipe && core_pipe_limit)
  		wait_for_dump_helpers(cprm.file);

Attachment: pgp00000.pgp
Description: PGP signature