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

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

[Mark Brown]

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

Hi all,

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

  arch/riscv/include/asm/acpi.h

between commit:

  286109eaee3d4 ("riscv: acpi: Handle LPI architectural context loss flags")

from the risc-v tree and commit:

  704ce0039a629 ("ACPI: irq: Move RISC-V interrupt controllers autodep to ACPI IRQ code")

from the pm 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/acpi.h
index 980aa11d77416,f598520ac9030..0000000000000
--- a/arch/riscv/include/asm/acpi.h
+++ b/arch/riscv/include/asm/acpi.h
@@@ -69,23 -67,7 +69,24 @@@ int acpi_get_riscv_isa(struct acpi_tabl
  
  void acpi_get_cbo_block_size(struct acpi_table_header *table, u32 *cbom_size,
  			     u32 *cboz_size, u32 *cbop_size);
+ acpi_handle acpi_get_riscv_gsi_handle(u32 gsi);
 +
 +/*
 + * RISC-V Functional Fixed Hardware Specification Version v1.0.1,
 + * Chapter 3.1.2, Table 4: Arch. Context Lost Flags
 + */
 +#define RISCV_LPI_HART_TIMER_CTXT_LOST		BIT(0)
 +
 +static inline unsigned int arch_get_idle_state_flags(u32 arch_flags)
 +{
 +	if (arch_flags & RISCV_LPI_HART_TIMER_CTXT_LOST)
 +		return CPUIDLE_FLAG_TIMER_STOP;
 +
 +	return 0;
 +}
 +
 +#define arch_get_idle_state_flags arch_get_idle_state_flags
 +
  #else
  static inline void acpi_init_rintc_map(void) { }
  static inline struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu)

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/riscv/include/asm/irq.h

between commit:

  f15c21a3de1b ("RISC-V: Enable IPI CPU Backtrace")

from the risc-v tree and commit:

  f8619b66bdb1 ("irqchip/riscv-intc: Add ACPI support for AIA")

from the pm 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/irq.h
index 8330d16b05b5,7e9a84a005ed..000000000000
--- a/arch/riscv/include/asm/irq.h
+++ b/arch/riscv/include/asm/irq.h
@@@ -12,11 -12,8 +12,13 @@@
  
  #include <asm-generic/irq.h>
  
+ #define INVALID_CONTEXT UINT_MAX
+ 
 +#ifdef CONFIG_SMP
 +void arch_trigger_cpumask_backtrace(const cpumask_t *mask, int exclude_cpu);
 +#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace
 +#endif
 +
  void riscv_set_intc_hwnode_fn(struct fwnode_handle *(*fn)(void));
  
  struct fwnode_handle *riscv_get_intc_hwnode(void);

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

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

[Stephen Rothwell]

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

Hi all,

On Mon, 2 Sep 2024 12:11:40 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the pm tree got a conflict in:
> 
>   arch/riscv/include/asm/irq.h
> 
> between commit:
> 
>   f15c21a3de1b ("RISC-V: Enable IPI CPU Backtrace")
> 
> from the risc-v tree and commit:
> 
>   f8619b66bdb1 ("irqchip/riscv-intc: Add ACPI support for AIA")
> 
> from the pm 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/irq.h
> index 8330d16b05b5,7e9a84a005ed..000000000000
> --- a/arch/riscv/include/asm/irq.h
> +++ b/arch/riscv/include/asm/irq.h
> @@@ -12,11 -12,8 +12,13 @@@
>   
>   #include <asm-generic/irq.h>
>   
> + #define INVALID_CONTEXT UINT_MAX
> + 
>  +#ifdef CONFIG_SMP
>  +void arch_trigger_cpumask_backtrace(const cpumask_t *mask, int exclude_cpu);
>  +#define arch_trigger_cpumask_backtrace arch_trigger_cpumask_backtrace
>  +#endif
>  +
>   void riscv_set_intc_hwnode_fn(struct fwnode_handle *(*fn)(void));
>   
>   struct fwnode_handle *riscv_get_intc_hwnode(void);

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

-- 
Cheers,
Stephen Rothwell

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