Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/alpha/kernel/process.c between commit 28d353d9891c ("alpha: take
kernel_execve() out of entry.S") from Linus' tree and commit 68f596a7a045
("alpha: rewrite kernel_execve in C") from the signal tree.
These appear to be the same patch with a slight difference in this file.
I just used the version from Linus' tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpxS5pIKu0T4.pgp
Description: PGP signature
