linux-next: manual merge of the parisc-hd tree with Linus' tree

2015-09-07 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the parisc-hd tree got a conflict in: arch/parisc/kernel/irq.c between commit: d2109a12198e ("parisc/irq: Use access helper irq_data_get_affinity_mask()") from Linus' tree and commit: b15e2f939727 ("parisc: Filter out spurious interrupts in PA-RISC ir

Re: linux-next: manual merge of the parisc-hd tree with Linus' tree

2014-02-04 Thread Helge Deller
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 02/04/2014 01:27 AM, Stephen Rothwell wrote: > Today's linux-next merge of the parisc-hd tree got a conflict in > arch/parisc/include/asm/elf.h between commit 9dabf60dc4ab ("parisc: add > flexible mmap memory layout support") from Linus' tree and co

linux-next: manual merge of the parisc-hd tree with Linus' tree

2014-02-03 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the parisc-hd tree got a conflict in arch/parisc/include/asm/elf.h between commit 9dabf60dc4ab ("parisc: add flexible mmap memory layout support") from Linus' tree and commit 13de8ec38997 ("parisc: add flexible mmap memory layout support") from the parisc-hd tre

linux-next: manual merge of the parisc-hd tree with Linus' tree

2013-05-26 Thread Stephen Rothwell
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_spinloc