linux-next: manual merge of the asm-generic tree with thearm-current tree

[Stephen Rothwell]

Hi Arnd,

Today's linux-next merge of the asm-generic tree got a conflict in
arch/arm/include/asm/page.h between commit
c0cbcd96d13ca0a90ff07babcd77c7d18cd2630d ("[ARM] 5534/1: kmalloc must
return a cache line aligned buffer") from the arm-current tree and commit
846d55eb38e14bbbd809e12a4b9d3fd2faf53c47 ("asm-generic: rename page.h and
uaccess.h") from the asm-generic tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/include/asm/page.h
index 7b52277,dee70a3..0000000
--- a/arch/arm/include/asm/page.h
+++ b/arch/arm/include/asm/page.h
@@@ -202,6 -202,13 +202,6 @@@ typedef struct page *pgtable_t
  	(((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
  	 VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
  
- #include <asm-generic/page.h>
 -/*
 - * With EABI on ARMv5 and above we must have 64-bit aligned slab pointers.
 - */
 -#if defined(CONFIG_AEABI) && (__LINUX_ARM_ARCH__ >= 5)
 -#define ARCH_SLAB_MINALIGN 8
 -#endif
 -
+ #include <asm-generic/getorder.h>
  
  #endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/