Messages in this thread | | | Date | Mon, 27 May 2013 10:51:35 +1000 | From | Stephen Rothwell <> | 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@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |