linux-next: manual merge of the akpm-current tree with the risc-v-fixes tree

[Mark Brown]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  arch/riscv/include/asm/pgtable.h

between commit:

  b6f2b2e600a27b798 ("RISC-V: Fix building error when CONFIG_SPARSEMEM_MANUAL=y")

from the risc-v-fixes tree and commit:

   e10b0ff68eee9f59 ("mm: consolidate pgtable_cache_init() and pgd_cache_init()")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc arch/riscv/include/asm/pgtable.h
index 1be4f70ab2660,f45f6fbd2a50d..0000000000000
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@@ -439,13 -411,12 +439,8 @@@ extern void *dtb_early_va
  extern void setup_bootmem(void);
  extern void paging_init(void);
  
- static inline void pgtable_cache_init(void)
- {
- 	/* No page table caches to initialize */
- }
 -#define VMALLOC_SIZE     (KERN_VIRT_SIZE >> 1)
 -#define VMALLOC_END      (PAGE_OFFSET - 1)
 -#define VMALLOC_START    (PAGE_OFFSET - VMALLOC_SIZE)
--
  /*
 - * Task size is 0x4000000000 for RV64 or 0xb800000 for RV32.
 + * Task size is 0x4000000000 for RV64 or 0x9fc00000 for RV32.
   * Note that PGDIR_SIZE must evenly divide TASK_SIZE.
   */
  #ifdef CONFIG_64BIT

Attachment: signature.asc
Description: PGP signature