Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm/mm/dma-mapping.c
between commit:
f12708965069 ("ARM: 8561/3: dma-mapping: Don't use outer_flush_range when the
L2C is coherent")
from the arm tree and patch:
"dma-mapping: remove dma_get_attr"
fr
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm/Kconfig
between commit:
437682eeab45 ("ARM: 8456/1: code patching only works on MMU")
from the arm tree and commits:
47fb802e4fcd ("arm: mm: support ARCH_MMAP_RND_BITS")
8100fa068b27 ("ARM: avoid
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm/include/asm/Kbuild
between commit:
57853e8906a0 ("ARM: 8403/1: kbuild: don't use generic mcs_spinlock.h header")
from the arm tree and commit:
74cf1a5a0c64 ("mm: clean up per architecture MM hook he
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm/include/asm/Kbuild between commit 8a87411b649c ("ARM: 8047/1:
rwsem: use asm-generic rwsem implementation") from the arm tree and
commit bca74b3faf68 ("lib/scatterlist: make ARCH_HAS_SG_CHAIN an actual
Kconfig"
On Thu, 2014-04-24 at 15:25 +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in
> arch/arm/include/asm/fixmap.h between commits 4221e2e6b316 ("ARM: 8031/1:
> fixmap: remove FIX_KMAP_BEGIN and FIX_KMAP_END") and a05e54c103b0 ("ARM:
> 8
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm/include/asm/fixmap.h between commits 4221e2e6b316 ("ARM: 8031/1:
fixmap: remove FIX_KMAP_BEGIN and FIX_KMAP_END") and a05e54c103b0 ("ARM:
8031/2: change fixmap mapping region to support 32 CPUs") from the arm
t
6 matches
Mail list logo
