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

[Mark Brown]

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: signature.asc
Description: PGP signature