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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/Kconfig

between commit:

  dffe11e280a4 ("riscv/vdso: Add support for time namespaces")

from the risc-v tree and commit:

  0953fb263714 ("irq: remove handle_domain_{irq,nmi}()")

from the irqchip 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 0050a2adf67b,353e28f5f849..000000000000
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -62,8 -62,6 +62,7 @@@ config RISC
  	select GENERIC_SCHED_CLOCK
  	select GENERIC_SMP_IDLE_THREAD
  	select GENERIC_TIME_VSYSCALL if MMU && 64BIT
 +	select GENERIC_VDSO_TIME_NS if HAVE_GENERIC_VDSO
- 	select HANDLE_DOMAIN_IRQ
  	select HAVE_ARCH_AUDITSYSCALL
  	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
  	select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL

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

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

[Stephen Rothwell]

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

Hi all,

On Wed, 27 Oct 2021 13:55:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the irqchip tree got a conflict in:
> 
>   arch/riscv/Kconfig
> 
> between commit:
> 
>   dffe11e280a4 ("riscv/vdso: Add support for time namespaces")
> 
> from the risc-v tree and commit:
> 
>   0953fb263714 ("irq: remove handle_domain_{irq,nmi}()")
> 
> from the irqchip 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/Kconfig
> index 0050a2adf67b,353e28f5f849..000000000000
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@@ -62,8 -62,6 +62,7 @@@ config RISC
>   	select GENERIC_SCHED_CLOCK
>   	select GENERIC_SMP_IDLE_THREAD
>   	select GENERIC_TIME_VSYSCALL if MMU && 64BIT
>  +	select GENERIC_VDSO_TIME_NS if HAVE_GENERIC_VDSO
> - 	select HANDLE_DOMAIN_IRQ
>   	select HAVE_ARCH_AUDITSYSCALL
>   	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
>   	select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL

This is now a conflict between the tip tree and the risc-v tree.

-- 
Cheers,
Stephen Rothwell

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