linux-next: manual merge of the risc-v-fixes tree with Linus' tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1660 bytes --]

Hi all,

Today's linux-next merge of the risc-v-fixes tree got a conflict in:

  arch/riscv/include/asm/pgtable.h

between commit:

  782de70c42930ba ("mm: consolidate pgtable_cache_init() and pgd_cache_init()")

from Linus' tree and commit:

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

from the risc-v-fixes 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 c60123f018f50,4f4162d90586d..0000000000000
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@@ -424,18 -436,11 +436,6 @@@ extern void *dtb_early_va
  extern void setup_bootmem(void);
  extern void paging_init(void);
  
- #define VMALLOC_SIZE     (KERN_VIRT_SIZE >> 1)
- #define VMALLOC_END      (PAGE_OFFSET - 1)
- #define VMALLOC_START    (PAGE_OFFSET - VMALLOC_SIZE)
- 
- #define FIXADDR_TOP      VMALLOC_START
- #ifdef CONFIG_64BIT
- #define FIXADDR_SIZE     PMD_SIZE
- #else
- #define FIXADDR_SIZE     PGDIR_SIZE
- #endif
- #define FIXADDR_START    (FIXADDR_TOP - FIXADDR_SIZE)
 -static inline void pgtable_cache_init(void)
 -{
 -	/* No page table caches to initialize */
 -}
--
  /*
   * Task size is 0x4000000000 for RV64 or 0x9fc00000 for RV32.
   * Note that PGDIR_SIZE must evenly divide TASK_SIZE.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]