* linux-next: manual merge of the ptrace tree with the sparc tree
@ 2011-10-14 4:47 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-10-14 4:47 UTC (permalink / raw)
To: Tejun Heo, Oleg Nesterov
Cc: linux-next, linux-kernel, Matt Fleming, David Miller
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-10-14 4:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-14 4:47 linux-next: manual merge of the ptrace tree with the sparc tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).