Hi Al, Today's linux-next merge of the signal tree got a conflict in arch/mips/kernel/linux32.c between commit 63981a409608 ("MIPS: compat: Return same error ENOSYS as native for invalid operation") from the mips tree and commit 56e41d3c5aa8 ("merge compat sys_ipc instances") from the signal tree. The latter removed the code fixed by the former, so I did that and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgp8a6TOmRrCQ.pgp
Description: PGP signature