linux-kernel - linux-next: manual merge of the ptrace tree with the sparc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20111014154738.5aee83104a71266012e46a9d@canb.auug.org.au>
Date:	Fri, 14 Oct 2011 15:47:38 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>, Oleg Nesterov <oleg@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Matt Fleming <matt.fleming@...el.com>,
	David Miller <davem@...emloft.net>
Subject: linux-next: manual merge of the ptrace tree with the sparc tree

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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped