Hi all,
Today's linux-next merge of the ptrace tree got conflicts in
arch/sparc/kernel/signal32.c, arch/sparc/kernel/signal_32.c and
arch/sparc/kernel/signal_64.c between commit faddf598f0ba ("sparc: Use
set_current_blocked()") from the sparc tree and commit 383fe35697e4
("sparc: Use set_current_blocked() and block_sigmask()") from the ptrace
tree.
I used ther version from the ptrace tree as these seem to go further (and
have a later Auther Date).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp9rwEZjs0or.pgp
Description: PGP signature
