linux-kernel - linux-next: manual merge of the openrisc tree with Linus' 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: <20110913121125.57aff757d1cfe59a117ee3f6@canb.auug.org.au>
Date:	Tue, 13 Sep 2011 12:11:25 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jonas Bonn <jonas@...thpole.se>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the openrisc tree with Linus' tree

Hi Jonas,

Today's linux-next merge of the openrisc tree got a conflict in
arch/openrisc/kernel/signal.c between commit d7cb66670905 ("openrisc:
don't use pt_regs in struct sigcontext") from Linus' tree and commit
ddf54eaa745b ("openrisc: don't use pt_regs in struct sigcontext") from
the openrisc tree.

Two slightly differentl versions of the same change.  I used the version
in Linus' tree.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped