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

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

[Stephen Rothwell]

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

Hi all,

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

  Documentation/riscv/patch-acceptance.rst

between commit:

  0e194d9da198 ("Documentation: riscv: add patch acceptance guidelines")

from Linus' tree and commit:

  d89a1a16d7dc ("Documentation: riscv: add patch acceptance guidelines")

from the risc-v tree.

I fixed it up (I used the version from Linus' tree as that was committed
later) 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.

-- 
Cheers,
Stephen Rothwell

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

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

[Paul Walmsley]

Hi Stephen,

On Mon, 6 Jan 2020, Stephen Rothwell wrote:

> Today's linux-next merge of the risc-v tree got a conflict in:
> 
>   Documentation/riscv/patch-acceptance.rst
> 
> between commit:
> 
>   0e194d9da198 ("Documentation: riscv: add patch acceptance guidelines")
> 
> from Linus' tree and commit:
> 
>   d89a1a16d7dc ("Documentation: riscv: add patch acceptance guidelines")
> 
> from the risc-v tree.
> 
> I fixed it up (I used the version from Linus' tree as that was committed
> later) 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.

Thanks, I just reset our for-next branch to v5.5-rc5, so this won't 
reappear.

- Paul

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

[Stephen Rothwell]

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

Hi Paul,

On Sun, 5 Jan 2020 17:50:35 -0800 (PST) Paul Walmsley <paul.walmsley@sifive.com> wrote:
> 
> Thanks, I just reset our for-next branch to v5.5-rc5, so this won't 
> reappear.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/include/asm/bitops.h

between commit:

  4356e9f841f7 ("work around gcc bugs with 'asm goto' with outputs")

from Linus' tree and commit:

  cb4ede926134 ("riscv: Avoid code duplication with generic bitops implementation")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/include/asm/bitops.h
index 329d8244a9b3,c4c2173dfe99..000000000000
--- a/arch/riscv/include/asm/bitops.h
+++ b/arch/riscv/include/asm/bitops.h
@@@ -37,9 -47,7 +47,7 @@@
  
  static __always_inline unsigned long variable__ffs(unsigned long word)
  {
- 	int num;
- 
 -	asm_volatile_goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 +	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
  				      RISCV_ISA_EXT_ZBB, 1)
  			  : : : : legacy);
  
@@@ -93,9 -76,7 +76,7 @@@ legacy
  
  static __always_inline unsigned long variable__fls(unsigned long word)
  {
- 	int num;
- 
 -	asm_volatile_goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 +	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
  				      RISCV_ISA_EXT_ZBB, 1)
  			  : : : : legacy);
  
@@@ -149,12 -105,7 +105,7 @@@ legacy
  
  static __always_inline int variable_ffs(int x)
  {
- 	int r;
- 
- 	if (!x)
- 		return 0;
- 
 -	asm_volatile_goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 +	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
  				      RISCV_ISA_EXT_ZBB, 1)
  			  : : : : legacy);
  
@@@ -204,12 -137,7 +137,7 @@@ legacy
  
  static __always_inline int variable_fls(unsigned int x)
  {
- 	int r;
- 
- 	if (!x)
- 		return 0;
- 
 -	asm_volatile_goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
 +	asm goto(ALTERNATIVE("j %l[legacy]", "nop", 0,
  				      RISCV_ISA_EXT_ZBB, 1)
  			  : : : : legacy);
  

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

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

[Palmer Dabbelt]

On Sun, 07 Jan 2024 14:49:57 PST (-0800), Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the risc-v tree got a conflict in:
>
>   arch/riscv/kernel/sys_riscv.c
>
> between commit:
>
>   777c0d761be7 ("RISC-V: hwprobe: Always use u64 for extension bits")
>
> from Linus' tree and commit:
>
>   53b2b22850e1 ("RISC-V: Move the hwprobe syscall to its own file")
>
> from the risc-v tree.
>
> I fixed it up (I used the latter version of this file and applied the
> following merge fix patch) 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.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 8 Jan 2024 09:46:10 +1100
> Subject: [PATCH] fix up for "RISC-V: Move the hwprobe syscall to its own file"
>
> interacting with commit
>
>   777c0d761be7 ("RISC-V: hwprobe: Always use u64 for extension bits")
>
> from Linus' tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/riscv/kernel/sys_hwprobe.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/riscv/kernel/sys_hwprobe.c b/arch/riscv/kernel/sys_hwprobe.c
> index ccf61b040536..41f45acb156b 100644
> --- a/arch/riscv/kernel/sys_hwprobe.c
> +++ b/arch/riscv/kernel/sys_hwprobe.c
> @@ -136,7 +136,7 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,
>  	pair->value &= ~missing;
>  }
>  
> -static bool hwprobe_ext0_has(const struct cpumask *cpus, unsigned long ext)
> +static bool hwprobe_ext0_has(const struct cpumask *cpus, u64 ext)
>  {
>  	struct riscv_hwprobe pair;
>  
> -- 
> 2.43.0
>
> -- 
> Cheers,
> Stephen Rothwell

Sorry, I think I screwed this up a few times.  I've got something on 
linux-next as of this morning that I think should be sane.

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/kernel/sys_riscv.c

between commit:

  777c0d761be7 ("RISC-V: hwprobe: Always use u64 for extension bits")

from Linus' tree and commit:

  53b2b22850e1 ("RISC-V: Move the hwprobe syscall to its own file")

from the risc-v tree.

I fixed it up (I used the latter version of this file and applied the
following merge fix patch) 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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 8 Jan 2024 09:46:10 +1100
Subject: [PATCH] fix up for "RISC-V: Move the hwprobe syscall to its own file"

interacting with commit

  777c0d761be7 ("RISC-V: hwprobe: Always use u64 for extension bits")

from Linus' tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/riscv/kernel/sys_hwprobe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/kernel/sys_hwprobe.c b/arch/riscv/kernel/sys_hwprobe.c
index ccf61b040536..41f45acb156b 100644
--- a/arch/riscv/kernel/sys_hwprobe.c
+++ b/arch/riscv/kernel/sys_hwprobe.c
@@ -136,7 +136,7 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,
 	pair->value &= ~missing;
 }
 
-static bool hwprobe_ext0_has(const struct cpumask *cpus, unsigned long ext)
+static bool hwprobe_ext0_has(const struct cpumask *cpus, u64 ext)
 {
 	struct riscv_hwprobe pair;
 
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/kernel/irq.c

between commit:

  07a27665754b ("RISC-V: Fix wrong use of CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK")

from Linus' tree and commit:

  82982fdd5133 ("riscv: Deduplicate IRQ stack switching")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/kernel/irq.c
index 9cc0a7669271,7bfea97ee7e7..000000000000
--- a/arch/riscv/kernel/irq.c
+++ b/arch/riscv/kernel/irq.c
@@@ -60,41 -79,23 +79,23 @@@ static void init_irq_stacks(void
  }
  #endif /* CONFIG_VMAP_STACK */
  
 -#ifdef CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK
 +#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK
+ static void ___do_softirq(struct pt_regs *regs)
+ {
+ 	__do_softirq();
+ }
+ 
  void do_softirq_own_stack(void)
  {
- #ifdef CONFIG_IRQ_STACKS
- 	if (on_thread_stack()) {
- 		ulong *sp = per_cpu(irq_stack_ptr, smp_processor_id())
- 					+ IRQ_STACK_SIZE/sizeof(ulong);
- 		__asm__ __volatile(
- 		"addi	sp, sp, -"RISCV_SZPTR  "\n"
- 		REG_S"  ra, (sp)		\n"
- 		"addi	sp, sp, -"RISCV_SZPTR  "\n"
- 		REG_S"  s0, (sp)		\n"
- 		"addi	s0, sp, 2*"RISCV_SZPTR "\n"
- 		"move	sp, %[sp]		\n"
- 		"call	__do_softirq		\n"
- 		"addi	sp, s0, -2*"RISCV_SZPTR"\n"
- 		REG_L"  s0, (sp)		\n"
- 		"addi	sp, sp, "RISCV_SZPTR   "\n"
- 		REG_L"  ra, (sp)		\n"
- 		"addi	sp, sp, "RISCV_SZPTR   "\n"
- 		:
- 		: [sp] "r" (sp)
- 		: "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7",
- 		  "t0", "t1", "t2", "t3", "t4", "t5", "t6",
- #ifndef CONFIG_FRAME_POINTER
- 		  "s0",
- #endif
- 		  "memory");
- 	} else
- #endif
+ 	if (on_thread_stack())
+ 		call_on_irq_stack(NULL, ___do_softirq);
+ 	else
  		__do_softirq();
  }
 -#endif /* CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK */
 +#endif /* CONFIG_SOFTIRQ_ON_OWN_STACK */
  
  #else
+ static void init_irq_scs(void) {}
  static void init_irq_stacks(void) {}
  #endif /* CONFIG_IRQ_STACKS */
  

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

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

[Palmer Dabbelt]

On Thu, 31 Aug 2023 10:50:15 PDT (-0700), ndesaulniers@google.com wrote:
> On Wed, Aug 30, 2023 at 4:29 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> 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.
>
> 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 ;)

>
>>
>> --
>> 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)
>>   {
>
>
>
> -- 
> Thanks,
> ~Nick Desaulniers

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

[Nick Desaulniers]

On Wed, Aug 30, 2023 at 4:29 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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.

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

>
> --
> 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)
>   {



-- 
Thanks,
~Nick Desaulniers

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

[Stephen Rothwell]

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

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.

-- 
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)
  {

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/mm/init.c

between commit:

  b690e266dae2 ("riscv: mm: fix truncation warning on RV32")

from Linus' tree and commit:

  5882e5acf18d ("riscv: kdump: Implement crashkernel=X,[high,low]")

from the risc-v tree.

I fixed it up (I just used the latter) 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.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/Kconfig

between commit:

  b97aec082b51 ("riscv: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL")

from Linus' tree and commit:

  ab7fa6b05ebb ("riscv: move options to keep entries sorted")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/Kconfig
index 6c12512d8278,c8c22cf11602..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -105,6 -105,11 +105,12 @@@ config RISC
  	select HAVE_CONTEXT_TRACKING_USER
  	select HAVE_DEBUG_KMEMLEAK
  	select HAVE_DMA_CONTIGUOUS if MMU
+ 	select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && (CLANG_SUPPORTS_DYNAMIC_FTRACE || GCC_SUPPORTS_DYNAMIC_FTRACE)
+ 	select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
+ 	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
++	select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER
+ 	select HAVE_FUNCTION_GRAPH_TRACER
+ 	select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !PREEMPTION
  	select HAVE_EBPF_JIT if MMU
  	select HAVE_FUNCTION_ARG_ACCESS_API
  	select HAVE_FUNCTION_ERROR_INJECTION

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

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

[Stephen Rothwell]

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

Hi all,

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

  MAINTAINERS

between commit:

  80e62bc8487b ("MAINTAINERS: re-sort all entries and fields")

from Linus' tree and commit:

  cc9e654a7e81 ("MAINTAINERS: Add entry for drivers/acpi/riscv")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 607504217dc3,0d6ecb5a4107..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -406,6 -406,19 +406,13 @@@ L:	linux-arm-kernel@lists.infradead.or
  S:	Maintained
  F:	drivers/acpi/arm64
  
 -ACPI SERIAL MULTI INSTANTIATE DRIVER
 -M:	Hans de Goede <hdegoede@redhat.com>
 -L:	platform-driver-x86@vger.kernel.org
 -S:	Maintained
 -F:	drivers/platform/x86/serial-multi-instantiate.c
 -
+ ACPI FOR RISC-V (ACPI/riscv)
+ M:	Sunil V L <sunilvl@ventanamicro.com>
+ L:	linux-acpi@vger.kernel.org
+ L:	linux-riscv@lists.infradead.org
+ S:	Maintained
+ F:	drivers/acpi/riscv/
+ 
  ACPI PCC(Platform Communication Channel) MAILBOX DRIVER
  M:	Sudeep Holla <sudeep.holla@arm.com>
  L:	linux-acpi@vger.kernel.org

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/include/asm/vdso/processor.h

between commit:

  0b1d60d6dd9e ("riscv: Fix build with CONFIG_CC_OPTIMIZE_FOR_SIZE=y")

from Linus' tree and commit:

  95bc69a47be2 ("riscv: cpu_relax: switch to riscv_has_extension_likely()")

from the risc-v tree.

I fixed it up (the former removed the line modified by the latter,
so I just used the former) 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.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

On Mon, 6 Feb 2023 09:40:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the risc-v tree got a conflict in:
> 
>   arch/riscv/include/asm/hwcap.h
> 
> between commit:
> 
>   0b1d60d6dd9e ("riscv: Fix build with CONFIG_CC_OPTIMIZE_FOR_SIZE=y")
> 
> from Linus' tree and commits:
> 
>   80c200b34ee8 ("RISC-V: resort all extensions in consistent orders")
>   d8a3d8a75206 ("riscv: hwcap: make ISA extension ids can be used in asm")
>   bdda5d554e43 ("riscv: introduce riscv_has_extension_[un]likely()")
>   03966594e117 ("riscv: remove riscv_isa_ext_keys[] array and related usage")
> 
> from the risc-v tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
                 ^^^^^^^^^
Actually, the latter commits supercede the former one, so I just used
the latter version.

> 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.

-- 
Cheers,
Stephen Rothwell


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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/include/asm/hwcap.h

between commit:

  0b1d60d6dd9e ("riscv: Fix build with CONFIG_CC_OPTIMIZE_FOR_SIZE=y")

from Linus' tree and commits:

  80c200b34ee8 ("RISC-V: resort all extensions in consistent orders")
  d8a3d8a75206 ("riscv: hwcap: make ISA extension ids can be used in asm")
  bdda5d554e43 ("riscv: introduce riscv_has_extension_[un]likely()")
  03966594e117 ("riscv: remove riscv_isa_ext_keys[] array and related usage")

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.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/kernel/probes/simulate-insn.h

between commit:

  b2d473a6019e ("riscv, kprobes: Stricter c.jr/c.jalr decoding")

from Linus' tree and commits:

  ec5f90877516 ("RISC-V: Move riscv_insn_is_* macros into a common header")
  c9c1af3f186a ("RISC-V: rename parse_asm.h to insn.h")

from the risc-v tree.

I fixed it up (The changes from the former are contained in the latter)
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.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/configs/defconfig

between commit:

  1776fca7fadb ("riscv: configs: defconfig: Enable Renesas RZ/Five SoC")

from Linus' tree and commit:

  497bcbe3ce04 ("RISC-V: Enable PMEM drivers")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/configs/defconfig
index f7f32448f160,fea1b17dbbd3..000000000000
--- a/arch/riscv/configs/defconfig
+++ b/arch/riscv/configs/defconfig
@@@ -123,8 -123,8 +124,9 @@@ CONFIG_MICROSEMI_PHY=
  CONFIG_INPUT_MOUSEDEV=y
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y
+ CONFIG_SERIAL_8250_DW=y
  CONFIG_SERIAL_OF_PLATFORM=y
 +CONFIG_SERIAL_SH_SCI=y
  CONFIG_VIRTIO_CONSOLE=y
  CONFIG_HW_RANDOM=y
  CONFIG_HW_RANDOM_VIRTIO=y
@@@ -161,7 -161,7 +163,8 @@@ CONFIG_VIRTIO_MMIO=
  CONFIG_RPMSG_CHAR=y
  CONFIG_RPMSG_CTRL=y
  CONFIG_RPMSG_VIRTIO=y
 +CONFIG_ARCH_R9A07G043=y
+ CONFIG_LIBNVDIMM=y
  CONFIG_EXT4_FS=y
  CONFIG_EXT4_FS_POSIX_ACL=y
  CONFIG_EXT4_FS_SECURITY=y

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/kernel/vdso.c

between commit:

  9b580a1d60de ("riscv: use vma iterator for vdso")

from Linus' tree and commit:

  a8616d2dc193 ("riscv: vdso: fix NULL deference in vdso_join_timens() when vfork")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/kernel/vdso.c
index 692e7ae3dcb8,4abc9aebdfae..000000000000
--- a/arch/riscv/kernel/vdso.c
+++ b/arch/riscv/kernel/vdso.c
@@@ -114,16 -119,18 +119,19 @@@ int vdso_join_timens(struct task_struc
  {
  	struct mm_struct *mm = task->mm;
  	struct vm_area_struct *vma;
 +	VMA_ITERATOR(vmi, mm, 0);
- 	struct __vdso_info *vdso_info = mm->context.vdso_info;
  
  	mmap_read_lock(mm);
  
 -	for (vma = mm->mmap; vma; vma = vma->vm_next) {
 +	for_each_vma(vmi, vma) {
  		unsigned long size = vma->vm_end - vma->vm_start;
  
- 		if (vma_is_special_mapping(vma, vdso_info->dm))
+ 		if (vma_is_special_mapping(vma, vdso_info.dm))
  			zap_page_range(vma, vma->vm_start, size);
+ #ifdef CONFIG_COMPAT
+ 		if (vma_is_special_mapping(vma, compat_vdso_info.dm))
+ 			zap_page_range(vma, vma->vm_start, size);
+ #endif
  	}
  
  	mmap_read_unlock(mm);

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/include/asm/errata_list.h

between commit:

  e83031564137 ("riscv: Fix ALT_THEAD_PMA's asm parameters")

from Linus' tree and commit:

  9c2ea4a36364 ("riscv: convert the t-head pbmt errata to use the __nops macro")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/include/asm/errata_list.h
index 416ead0f9a65,e4ee53551343..000000000000
--- a/arch/riscv/include/asm/errata_list.h
+++ b/arch/riscv/include/asm/errata_list.h
@@@ -68,19 -68,13 +68,13 @@@ asm(ALTERNATIVE_2("li %0, 0\t\nnop"
   */
  #define ALT_THEAD_PMA(_val)						\
  asm volatile(ALTERNATIVE(						\
- 	"nop\n\t"							\
- 	"nop\n\t"							\
- 	"nop\n\t"							\
- 	"nop\n\t"							\
- 	"nop\n\t"							\
- 	"nop\n\t"							\
- 	"nop",								\
+ 	__nops(7),							\
 -	"li      t3, %2\n\t"						\
 -	"slli    t3, t3, %4\n\t"					\
 +	"li      t3, %1\n\t"						\
 +	"slli    t3, t3, %3\n\t"					\
  	"and     t3, %0, t3\n\t"					\
  	"bne     t3, zero, 2f\n\t"					\
 -	"li      t3, %3\n\t"						\
 -	"slli    t3, t3, %4\n\t"					\
 +	"li      t3, %2\n\t"						\
 +	"slli    t3, t3, %3\n\t"					\
  	"or      %0, %0, t3\n\t"					\
  	"2:",  THEAD_VENDOR_ID,						\
  		ERRATA_THEAD_PBMT, CONFIG_ERRATA_THEAD_PBMT)		\


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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/kernel/Makefile

between commit:

  22e2100b1b07 ("riscv: fix oops caused by irqsoff latency tracer")

from Linus' tree and commit:

  9dc6ce802136 ("RISC-V: Remove the current perf implementation")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/kernel/Makefile
index ffc87e76b1dd,fb63b462ff85..000000000000
--- a/arch/riscv/kernel/Makefile
+++ b/arch/riscv/kernel/Makefile
@@@ -51,9 -51,6 +51,8 @@@ obj-$(CONFIG_MODULE_SECTIONS)	+= module
  obj-$(CONFIG_FUNCTION_TRACER)	+= mcount.o ftrace.o
  obj-$(CONFIG_DYNAMIC_FTRACE)	+= mcount-dyn.o
  
 +obj-$(CONFIG_TRACE_IRQFLAGS)	+= trace_irq.o
 +
- obj-$(CONFIG_RISCV_BASE_PMU)	+= perf_event.o
  obj-$(CONFIG_PERF_EVENTS)	+= perf_callchain.o
  obj-$(CONFIG_HAVE_PERF_REGS)	+= perf_regs.o
  obj-$(CONFIG_RISCV_SBI)		+= sbi.o

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/boot/dts/sifive/hifive-unmatched-a00.dts

between commit:

  cd29cc8ad254 ("riscv: dts: sifive unmatched: Expose the PMIC sub-functions")

from Linus' tree and commit:

  dacef016c088 ("riscv: dts: enable more DA9063 functions for the SiFive HiFive Unmatched")

from the risc-v tree.

I fixed it up (they are doing the same thing slightly differetnyl, I
used the latter) 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.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/Kconfig

between commits:

  42e0e0b453bc ("riscv: code patching only works on !XIP_KERNEL")
  63703f37aa09 ("mm: generalize ZONE_[DMA|DMA32]")

from Linus' tree and commits:

  e88b333142e4 ("riscv: mm: add THP support on 64-bit")
  3332f4190674 ("riscv: mremap speedup - enable HAVE_MOVE_PUD and HAVE_MOVE_PMD")
  7fa865f5640a ("riscv: TRANSPARENT_HUGEPAGE: depends on MMU")
  47513f243b45 ("riscv: Enable KFENCE for riscv64")

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.

N.B. The new select of HAVE_ARCH_TRANSPARENT_HUGEPAGE is out of order :-(

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/Kconfig
index 469a70bd8da6,7304278dbbe9..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -61,11 -60,12 +61,12 @@@ config RISC
  	select GENERIC_TIME_VSYSCALL if MMU && 64BIT
  	select HANDLE_DOMAIN_IRQ
  	select HAVE_ARCH_AUDITSYSCALL
 -	select HAVE_ARCH_JUMP_LABEL
 -	select HAVE_ARCH_JUMP_LABEL_RELATIVE
 +	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
 +	select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL
  	select HAVE_ARCH_KASAN if MMU && 64BIT
  	select HAVE_ARCH_KASAN_VMALLOC if MMU && 64BIT
+ 	select HAVE_ARCH_KFENCE if MMU && 64BIT
 -	select HAVE_ARCH_KGDB
 +	select HAVE_ARCH_KGDB if !XIP_KERNEL
  	select HAVE_ARCH_KGDB_QXFER_PKT
  	select HAVE_ARCH_MMAP_RND_BITS if MMU
  	select HAVE_ARCH_SECCOMP_FILTER
@@@ -80,9 -80,11 +81,11 @@@
  	select HAVE_GCC_PLUGINS
  	select HAVE_GENERIC_VDSO if MMU && 64BIT
  	select HAVE_IRQ_TIME_ACCOUNTING
 -	select HAVE_KPROBES
 -	select HAVE_KPROBES_ON_FTRACE
 -	select HAVE_KRETPROBES
 +	select HAVE_KPROBES if !XIP_KERNEL
 +	select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL
 +	select HAVE_KRETPROBES if !XIP_KERNEL
+ 	select HAVE_MOVE_PMD
+ 	select HAVE_MOVE_PUD
  	select HAVE_PCI
  	select HAVE_PERF_EVENTS
  	select HAVE_PERF_REGS
@@@ -104,7 -106,7 +107,8 @@@
  	select SYSCTL_EXCEPTION_TRACE
  	select THREAD_INFO_IN_TASK
  	select UACCESS_MEMCPY if !MMU
 +	select ZONE_DMA32 if 64BIT
+ 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU
  
  config ARCH_MMAP_RND_BITS_MIN
  	default 18 if 64BIT

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/Kconfig

between commit:

  42e0e0b453bc ("riscv: code patching only works on !XIP_KERNEL")

from Linus' tree and commits:

  3332f4190674 ("riscv: mremap speedup - enable HAVE_MOVE_PUD and HAVE_MOVE_PMD")
  14512690a165 ("riscv: Enable HAVE_ARCH_HUGE_VMAP for 64BIT")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/Kconfig
index 18ec0f9bb8d5,227033595994..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -61,11 -60,12 +61,12 @@@ config RISC
  	select GENERIC_TIME_VSYSCALL if MMU && 64BIT
  	select HANDLE_DOMAIN_IRQ
  	select HAVE_ARCH_AUDITSYSCALL
+ 	select HAVE_ARCH_HUGE_VMAP if MMU && 64BIT
 -	select HAVE_ARCH_JUMP_LABEL
 -	select HAVE_ARCH_JUMP_LABEL_RELATIVE
 +	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
 +	select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL
  	select HAVE_ARCH_KASAN if MMU && 64BIT
  	select HAVE_ARCH_KASAN_VMALLOC if MMU && 64BIT
 -	select HAVE_ARCH_KGDB
 +	select HAVE_ARCH_KGDB if !XIP_KERNEL
  	select HAVE_ARCH_KGDB_QXFER_PKT
  	select HAVE_ARCH_MMAP_RND_BITS if MMU
  	select HAVE_ARCH_SECCOMP_FILTER
@@@ -80,9 -81,11 +82,11 @@@
  	select HAVE_GCC_PLUGINS
  	select HAVE_GENERIC_VDSO if MMU && 64BIT
  	select HAVE_IRQ_TIME_ACCOUNTING
 -	select HAVE_KPROBES
 -	select HAVE_KPROBES_ON_FTRACE
 -	select HAVE_KRETPROBES
 +	select HAVE_KPROBES if !XIP_KERNEL
 +	select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL
 +	select HAVE_KRETPROBES if !XIP_KERNEL
+ 	select HAVE_MOVE_PMD
+ 	select HAVE_MOVE_PUD
  	select HAVE_PCI
  	select HAVE_PERF_EVENTS
  	select HAVE_PERF_REGS

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/kernel/setup.c

between commit:

  ce989f1472ae ("RISC-V: Fix out-of-bounds accesses in init_resources()")

from Linus' tree and commit:

  ffe0e5261268 ("RISC-V: Improve init_resources()")

from the risc-v tree.

I fixed it up (I used the latter since it fixed the same problem as the
former but in a different way) 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.

-- 
Cheers,
Stephen Rothwell

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

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

[Palmer Dabbelt]

On Tue, 30 Mar 2021 15:40:34 PDT (-0700), Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the risc-v tree got a conflict in:
>
>   arch/riscv/mm/kasan_init.c
>
> between commits:
>
>   f3773dd031de ("riscv: Ensure page table writes are flushed when initializing KASAN vmalloc")
>   78947bdfd752 ("RISC-V: kasan: Declare kasan_shallow_populate() static")
>
> from Linus' tree and commit:
>
>   2da073c19641 ("riscv: Cleanup KASAN_VMALLOC support")
>
> from the risc-v tree.
>
> I fixed it up (I think - 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.

They're my own trees ;)

I'm not so great at reading merge diffs, but the right fix here is to 
have the local_flush_tlb_all() after the call to 
kasan_shallow_populate_pgd(), just as there is one after 
kasan_populate_pgd().  My merge diff looks like this

diff --cc arch/riscv/mm/kasan_init.c
index 2c39f0386673,4f85c6d0ddf8..ec0029097251
--- a/arch/riscv/mm/kasan_init.c
+++ b/arch/riscv/mm/kasan_init.c
@@@ -162,8 -159,36 +162,10 @@@ static void __init kasan_shallow_popula
  {
        unsigned long vaddr = (unsigned long)start & PAGE_MASK;
        unsigned long vend = PAGE_ALIGN((unsigned long)end);
 -      unsigned long pfn;
 -      int index;
 -      void *p;
 -      pud_t *pud_dir, *pud_k;
 -      pgd_t *pgd_dir, *pgd_k;
 -      p4d_t *p4d_dir, *p4d_k;
 -
 -      while (vaddr < vend) {
 -              index = pgd_index(vaddr);
 -              pfn = csr_read(CSR_SATP) & SATP_PPN;
 -              pgd_dir = (pgd_t *)pfn_to_virt(pfn) + index;
 -              pgd_k = init_mm.pgd + index;
 -              pgd_dir = pgd_offset_k(vaddr);
 -              set_pgd(pgd_dir, *pgd_k);
 -
 -              p4d_dir = p4d_offset(pgd_dir, vaddr);
 -              p4d_k  = p4d_offset(pgd_k, vaddr);
 -
 -              vaddr = (vaddr + PUD_SIZE) & PUD_MASK;
 -              pud_dir = pud_offset(p4d_dir, vaddr);
 -              pud_k = pud_offset(p4d_k, vaddr);
 -
 -              if (pud_present(*pud_dir)) {
 -                      p = early_alloc(PAGE_SIZE, NUMA_NO_NODE);
 -                      pud_populate(&init_mm, pud_dir, p);
 -              }
 -              vaddr += PAGE_SIZE;
 -      }
 +
 +      kasan_shallow_populate_pgd(vaddr, vend);
+
+       local_flush_tlb_all();
  }

  void __init kasan_init(void)

which doesn't include the diff to kasan_shallow_populate_pgd().  Not 
sure if that's just because my diff is in the other direction, though.  
The expected result is that kasan_shallow_populate_pgd() exists both pre 
and post merge.

>
> -- 
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/riscv/mm/kasan_init.c
> index 4f85c6d0ddf8,2c39f0386673..000000000000
> --- a/arch/riscv/mm/kasan_init.c
> +++ b/arch/riscv/mm/kasan_init.c
> @@@ -153,44 -141,31 +141,33 @@@ static void __init kasan_populate(void 
>   
>   	local_flush_tlb_all();
>   	memset(start, KASAN_SHADOW_INIT, end - start);
>   }
>   
> + static void __init kasan_shallow_populate_pgd(unsigned long vaddr, unsigned long end)
> + {
> + 	unsigned long next;
> + 	void *p;
> + 	pgd_t *pgd_k = pgd_offset_k(vaddr);
> + 
> + 	do {
> + 		next = pgd_addr_end(vaddr, end);
> + 		if (pgd_page_vaddr(*pgd_k) == (unsigned long)lm_alias(kasan_early_shadow_pmd)) {
> + 			p = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
> + 			set_pgd(pgd_k, pfn_pgd(PFN_DOWN(__pa(p)), PAGE_TABLE));
> + 		}
> + 	} while (pgd_k++, vaddr = next, vaddr != end);
> + }
> + 
>   static void __init kasan_shallow_populate(void *start, void *end)
>   {
>   	unsigned long vaddr = (unsigned long)start & PAGE_MASK;
>   	unsigned long vend = PAGE_ALIGN((unsigned long)end);
> - 	unsigned long pfn;
> - 	int index;
> - 	void *p;
> - 	pud_t *pud_dir, *pud_k;
> - 	pgd_t *pgd_dir, *pgd_k;
> - 	p4d_t *p4d_dir, *p4d_k;
> - 
> - 	while (vaddr < vend) {
> - 		index = pgd_index(vaddr);
> - 		pfn = csr_read(CSR_SATP) & SATP_PPN;
> - 		pgd_dir = (pgd_t *)pfn_to_virt(pfn) + index;
> - 		pgd_k = init_mm.pgd + index;
> - 		pgd_dir = pgd_offset_k(vaddr);
> - 		set_pgd(pgd_dir, *pgd_k);
> - 
> - 		p4d_dir = p4d_offset(pgd_dir, vaddr);
> - 		p4d_k  = p4d_offset(pgd_k, vaddr);
> - 
> - 		vaddr = (vaddr + PUD_SIZE) & PUD_MASK;
> - 		pud_dir = pud_offset(p4d_dir, vaddr);
> - 		pud_k = pud_offset(p4d_k, vaddr);
> - 
> - 		if (pud_present(*pud_dir)) {
> - 			p = early_alloc(PAGE_SIZE, NUMA_NO_NODE);
> - 			pud_populate(&init_mm, pud_dir, p);
> - 		}
> - 		vaddr += PAGE_SIZE;
> - 	}
> + 
> + 	kasan_shallow_populate_pgd(vaddr, vend);
>  +
>  +	local_flush_tlb_all();
>   }
>   
>   void __init kasan_init(void)
>   {
>   	phys_addr_t _start, _end;

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/mm/kasan_init.c

between commits:

  f3773dd031de ("riscv: Ensure page table writes are flushed when initializing KASAN vmalloc")
  78947bdfd752 ("RISC-V: kasan: Declare kasan_shallow_populate() static")

from Linus' tree and commit:

  2da073c19641 ("riscv: Cleanup KASAN_VMALLOC support")

from the risc-v tree.

I fixed it up (I think - 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/mm/kasan_init.c
index 4f85c6d0ddf8,2c39f0386673..000000000000
--- a/arch/riscv/mm/kasan_init.c
+++ b/arch/riscv/mm/kasan_init.c
@@@ -153,44 -141,31 +141,33 @@@ static void __init kasan_populate(void 
  
  	local_flush_tlb_all();
  	memset(start, KASAN_SHADOW_INIT, end - start);
  }
  
+ static void __init kasan_shallow_populate_pgd(unsigned long vaddr, unsigned long end)
+ {
+ 	unsigned long next;
+ 	void *p;
+ 	pgd_t *pgd_k = pgd_offset_k(vaddr);
+ 
+ 	do {
+ 		next = pgd_addr_end(vaddr, end);
+ 		if (pgd_page_vaddr(*pgd_k) == (unsigned long)lm_alias(kasan_early_shadow_pmd)) {
+ 			p = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
+ 			set_pgd(pgd_k, pfn_pgd(PFN_DOWN(__pa(p)), PAGE_TABLE));
+ 		}
+ 	} while (pgd_k++, vaddr = next, vaddr != end);
+ }
+ 
  static void __init kasan_shallow_populate(void *start, void *end)
  {
  	unsigned long vaddr = (unsigned long)start & PAGE_MASK;
  	unsigned long vend = PAGE_ALIGN((unsigned long)end);
- 	unsigned long pfn;
- 	int index;
- 	void *p;
- 	pud_t *pud_dir, *pud_k;
- 	pgd_t *pgd_dir, *pgd_k;
- 	p4d_t *p4d_dir, *p4d_k;
- 
- 	while (vaddr < vend) {
- 		index = pgd_index(vaddr);
- 		pfn = csr_read(CSR_SATP) & SATP_PPN;
- 		pgd_dir = (pgd_t *)pfn_to_virt(pfn) + index;
- 		pgd_k = init_mm.pgd + index;
- 		pgd_dir = pgd_offset_k(vaddr);
- 		set_pgd(pgd_dir, *pgd_k);
- 
- 		p4d_dir = p4d_offset(pgd_dir, vaddr);
- 		p4d_k  = p4d_offset(pgd_k, vaddr);
- 
- 		vaddr = (vaddr + PUD_SIZE) & PUD_MASK;
- 		pud_dir = pud_offset(p4d_dir, vaddr);
- 		pud_k = pud_offset(p4d_k, vaddr);
- 
- 		if (pud_present(*pud_dir)) {
- 			p = early_alloc(PAGE_SIZE, NUMA_NO_NODE);
- 			pud_populate(&init_mm, pud_dir, p);
- 		}
- 		vaddr += PAGE_SIZE;
- 	}
+ 
+ 	kasan_shallow_populate_pgd(vaddr, vend);
 +
 +	local_flush_tlb_all();
  }
  
  void __init kasan_init(void)
  {
  	phys_addr_t _start, _end;

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

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

[Stephen Rothwell]

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

Hi all,

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

  drivers/soc/Makefile

between commit:

  89d4f98ae90d ("ARM: remove zte zx platform")

from Linus' tree and commits:

  08734e0581a5 ("riscv: Use vendor name for K210 SoC support")
  e134d426e1a3 ("soc: canaan: Sort the Makefile alphabetically")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/soc/Makefile
index 9bceb12b291d,34b23645be14..000000000000
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@@ -28,4 -29,4 +29,3 @@@ obj-y				+= ti
  obj-$(CONFIG_ARCH_U8500)	+= ux500/
  obj-$(CONFIG_PLAT_VERSATILE)	+= versatile/
  obj-y				+= xilinx/
- obj-$(CONFIG_SOC_KENDRYTE)	+= kendryte/
 -obj-$(CONFIG_ARCH_ZX)		+= zte/

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/kernel/vdso/Makefile

between commit:

  a96843372331 ("kbuild: explicitly specify the build id style")

from Linus' tree and commit:

  f69e1c7418b1 ("RISC-V: Fix the VDSO symbol generaton for binutils-2.35+")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/kernel/vdso/Makefile
index 7d6a94d45ec9,a8ecf102e09b..000000000000
--- a/arch/riscv/kernel/vdso/Makefile
+++ b/arch/riscv/kernel/vdso/Makefile
@@@ -43,6 -43,8 +43,8 @@@ $(obj)/vdso.o: $(obj)/vdso.s
  SYSCFLAGS_vdso.so.dbg = $(c_flags)
  $(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) FORCE
  	$(call if_changed,vdsold)
+ SYSCFLAGS_vdso.so.dbg = -shared -s -Wl,-soname=linux-vdso.so.1 \
 -	-Wl,--build-id -Wl,--hash-style=both
++	-Wl,--build-id=sha1 -Wl,--hash-style=both
  
  # We also create a special relocatable object that should mirror the symbol
  # table and layout of the linked DSO. With ld --just-symbols we can then

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/Kconfig

between commit:

  20bda4ed62f5 ("riscv: Implement copy_thread_tls")

from Linus' tree and commit:

  d0f057940663 ("riscv: Add KASAN support")
  5b800fd350d6 ("riscv: add required functions to enable HAVE_REGS_AND_STACK_ACCESS_API")
  a630fb824cf5 ("riscv: Add support for restartable sequence")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/riscv/Kconfig
index fa7dc03459e7,9220071bb7da..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -65,7 -63,9 +63,10 @@@ config RISC
  	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU
  	select HAVE_ARCH_MMAP_RND_BITS if MMU
  	select ARCH_HAS_GCOV_PROFILE_ALL
 +	select HAVE_COPY_THREAD_TLS
+ 	select HAVE_ARCH_KASAN if MMU && 64BIT
+ 	select HAVE_REGS_AND_STACK_ACCESS_API
+ 	select HAVE_RSEQ
  
  config ARCH_MMAP_RND_BITS_MIN
  	default 18 if 64BIT

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