linux-kernel - linux-next: manual merge of the parisc-hd 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]

Date:	Mon, 27 May 2013 10:51:35 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Helge Deller <deller@....de>,
	Parisc List <linux-parisc@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the parisc-hd tree with Linus' tree

Hi all,

Today's linux-next merge of the parisc-hd tree got conflicts in
arch/parisc/include/asm/processor.h and arch/parisc/kernel/irq.c between
commit d96b51ec1465 ("parisc: fix irq stack on UP and SMP") from Linus'
tree and commit 1c92ce8487f6 ("parisc: use arch_spinlock_t instead of
raw_spinlock_t in irqstacks") from the parisc-hd tree.

I just used the version of both files from Linus' tree and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped