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
-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
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
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
4 matches
Mail list logo