Skip to contentSkip to conversation

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

DISCUSSION Stephen Rothwell 3 participants 3 messages Aug 30, 2023 – Sep 1, 2023 Linux-next tree

lore
Share & tools
lore

Stephen Rothwell

author
#0 lore raw

Hi all,

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

arch/riscv/mm/kasan_init.c

between commit:

d2402048bc8a ("riscv: mm: fix 2 instances of -Wmissing-variable-declarations")

from Linus' tree and commit:

56e1803d9de0 ("riscv: Mark KASAN tmp* page tables variables as static")

from the risc-v 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.

Signature · 21 lines
Cheers,
Stephen Rothwell

diff --cc arch/riscv/mm/kasan_init.c
index a01bc15dce24,435e94a5b1bb..000000000000
--- a/arch/riscv/mm/kasan_init.c
+++ b/arch/riscv/mm/kasan_init.c
@@@ -22,9 -22,10 +22,9 @@@
   * region is not and then we have to go down to the PUD level.
   */
  
- pgd_t tmp_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
- p4d_t tmp_p4d[PTRS_PER_P4D] __page_aligned_bss;
- pud_t tmp_pud[PTRS_PER_PUD] __page_aligned_bss;
 -extern pgd_t early_pg_dir[PTRS_PER_PGD];
+ static pgd_t tmp_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
+ static p4d_t tmp_p4d[PTRS_PER_P4D] __page_aligned_bss;
+ static pud_t tmp_pud[PTRS_PER_PUD] __page_aligned_bss;
  
  static void __init kasan_populate_pte(pmd_t *pmd, unsigned long vaddr, unsigned long end)
  {
#1 lore raw
Quoted 15 lines · Stephen Rothwell

Hi all,

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

arch/riscv/mm/kasan_init.c

between commit:

d2402048bc8a ("riscv: mm: fix 2 instances of -Wmissing-variable-declarations")

from Linus' tree and commit:

56e1803d9de0 ("riscv: Mark KASAN tmp* page tables variables as static")

Quoted 8 lines

from the risc-v 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.

Fix LGTM; I guess Palmer you may need to rebase that branch on mainline?

Quoted 23 lines

--
Cheers,
Stephen Rothwell

arch/riscv/mm/kasan_init.c +3 -3
diff --cc arch/riscv/mm/kasan_init.c
index a01bc15dce24,435e94a5b1bb..000000000000
@@@ -22,9 -22,10 +22,9 @@@
   * region is not and then we have to go down to the PUD level.
   */
 
- pgd_t tmp_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
- p4d_t tmp_p4d[PTRS_PER_P4D] __page_aligned_bss;
- pud_t tmp_pud[PTRS_PER_PUD] __page_aligned_bss;
 -extern pgd_t early_pg_dir[PTRS_PER_PGD];
+ static pgd_t tmp_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
+ static p4d_t tmp_p4d[PTRS_PER_P4D] __page_aligned_bss;
+ static pud_t tmp_pud[PTRS_PER_PUD] __page_aligned_bss;
 
  static void __init kasan_populate_pte(pmd_t *pmd, unsigned long vaddr, unsigned long end)
  {
Signature · 2 lines
Thanks,
~Nick Desaulniers
#2 lore raw
Quoted 18 lines · On Thu, 31 Aug 2023 10:50:15 PDT (-0700), [email protected] wrote:
Quoted 17 lines · Stephen Rothwell

Hi all,

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

arch/riscv/mm/kasan_init.c

between commit:

d2402048bc8a ("riscv: mm: fix 2 instances of -Wmissing-variable-declarations")

from Linus' tree and commit:

56e1803d9de0 ("riscv: Mark KASAN tmp* page tables variables as static")

from the risc-v tree.

Quoted 8 lines
Quoted 6 lines

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.

Fix LGTM; I guess Palmer you may need to rebase that branch on mainline?

Looks like I just missed it and Linus fixed it up, sorry about that -- for some reason my email hadn't been landing locally, I just fixed that too ;)

Quoted 30 lines
Quoted 24 lines

--
Cheers,
Stephen Rothwell

arch/riscv/mm/kasan_init.c +3 -3
diff --cc arch/riscv/mm/kasan_init.c
index a01bc15dce24,435e94a5b1bb..000000000000
@@@ -22,9 -22,10 +22,9 @@@
   * region is not and then we have to go down to the PUD level.
   */
 
- pgd_t tmp_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
- p4d_t tmp_p4d[PTRS_PER_P4D] __page_aligned_bss;
- pud_t tmp_pud[PTRS_PER_PUD] __page_aligned_bss;
 -extern pgd_t early_pg_dir[PTRS_PER_PGD];
+ static pgd_t tmp_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
+ static p4d_t tmp_p4d[PTRS_PER_P4D] __page_aligned_bss;
+ static pud_t tmp_pud[PTRS_PER_PUD] __page_aligned_bss;
 
  static void __init kasan_populate_pte(pmd_t *pmd, unsigned long vaddr, unsigned long end)
  {
Signature · 2 lines
Thanks,
~Nick Desaulniers