linux-next: manual merge of the pm tree with the loongarch tree

[Stephen Rothwell]

Hi all,

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

  include/acpi/actbl2.h

between commit:

  cb41f313b29e ("ACPICA: MADT: Add LoongArch APICs support")

from the loongarch tree and commit:

  da6a9bbedc79 ("ACPICA: iASL/MADT: Add OEM-defined subtable")

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 include/acpi/actbl2.h
index 2419f9e397e2,655102bc6d14..000000000000
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@@ -762,14 -865,8 +865,15 @@@ enum acpi_madt_type 
  	ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR = 14,
  	ACPI_MADT_TYPE_GENERIC_TRANSLATOR = 15,
  	ACPI_MADT_TYPE_MULTIPROC_WAKEUP = 16,
 -	ACPI_MADT_TYPE_RESERVED = 17,	/* 17 to 0x7F are reserved */
 +	ACPI_MADT_TYPE_CORE_PIC = 17,
 +	ACPI_MADT_TYPE_LIO_PIC = 18,
 +	ACPI_MADT_TYPE_HT_PIC = 19,
 +	ACPI_MADT_TYPE_EIO_PIC = 20,
 +	ACPI_MADT_TYPE_MSI_PIC = 21,
 +	ACPI_MADT_TYPE_BIO_PIC = 22,
 +	ACPI_MADT_TYPE_LPC_PIC = 23,
- 	ACPI_MADT_TYPE_RESERVED = 24	/* 24 and greater are reserved */
++	ACPI_MADT_TYPE_RESERVED = 24	/* 24 to 0x7F are reserved */
+ 	ACPI_MADT_TYPE_OEM_RESERVED = 0x80	/* 0x80 to 0xFF are reserved for OEM use */
  };
  
  /*
@@@ -999,120 -1096,10 +1103,125 @@@ struct acpi_madt_multiproc_wakeup_mailb
  
  #define ACPI_MP_WAKE_COMMAND_WAKEUP    1
  
 +/* Values for Version field above */
 +
 +enum acpi_madt_core_pic_version {
 +	ACPI_MADT_CORE_PIC_VERSION_NONE = 0,
 +	ACPI_MADT_CORE_PIC_VERSION_V1 = 1,
 +	ACPI_MADT_CORE_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */
 +};
 +
 +enum acpi_madt_lio_pic_version {
 +	ACPI_MADT_LIO_PIC_VERSION_NONE = 0,
 +	ACPI_MADT_LIO_PIC_VERSION_V1 = 1,
 +	ACPI_MADT_LIO_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */
 +};
 +
 +enum acpi_madt_eio_pic_version {
 +	ACPI_MADT_EIO_PIC_VERSION_NONE = 0,
 +	ACPI_MADT_EIO_PIC_VERSION_V1 = 1,
 +	ACPI_MADT_EIO_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */
 +};
 +
 +enum acpi_madt_ht_pic_version {
 +	ACPI_MADT_HT_PIC_VERSION_NONE = 0,
 +	ACPI_MADT_HT_PIC_VERSION_V1 = 1,
 +	ACPI_MADT_HT_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */
 +};
 +
 +enum acpi_madt_bio_pic_version {
 +	ACPI_MADT_BIO_PIC_VERSION_NONE = 0,
 +	ACPI_MADT_BIO_PIC_VERSION_V1 = 1,
 +	ACPI_MADT_BIO_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */
 +};
 +
 +enum acpi_madt_msi_pic_version {
 +	ACPI_MADT_MSI_PIC_VERSION_NONE = 0,
 +	ACPI_MADT_MSI_PIC_VERSION_V1 = 1,
 +	ACPI_MADT_MSI_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */
 +};
 +
 +enum acpi_madt_lpc_pic_version {
 +	ACPI_MADT_LPC_PIC_VERSION_NONE = 0,
 +	ACPI_MADT_LPC_PIC_VERSION_V1 = 1,
 +	ACPI_MADT_LPC_PIC_VERSION_RESERVED = 2	/* 2 and greater are reserved */
 +};
 +
 +/* Core Interrupt Controller */
 +
 +struct acpi_madt_core_pic {
 +	struct acpi_subtable_header header;
 +	u8 version;
 +	u32 processor_id;
 +	u32 core_id;
 +	u32 flags;
 +};
 +
 +/* Legacy I/O Interrupt Controller */
 +
 +struct acpi_madt_lio_pic {
 +	struct acpi_subtable_header header;
 +	u8 version;
 +	u64 address;
 +	u16 size;
 +	u8 cascade[2];
 +	u32 cascade_map[2];
 +};
 +
 +/* Extend I/O Interrupt Controller */
 +
 +struct acpi_madt_eio_pic {
 +	struct acpi_subtable_header header;
 +	u8 version;
 +	u8 cascade;
 +	u8 node;
 +	u64 node_map;
 +};
 +
 +/* HT Interrupt Controller */
 +
 +struct acpi_madt_ht_pic {
 +	struct acpi_subtable_header header;
 +	u8 version;
 +	u64 address;
 +	u16 size;
 +	u8 cascade[8];
 +};
 +
 +/* Bridge I/O Interrupt Controller */
 +
 +struct acpi_madt_bio_pic {
 +	struct acpi_subtable_header header;
 +	u8 version;
 +	u64 address;
 +	u16 size;
 +	u16 id;
 +	u16 gsi_base;
 +};
 +
 +/* MSI Interrupt Controller */
 +
 +struct acpi_madt_msi_pic {
 +	struct acpi_subtable_header header;
 +	u8 version;
 +	u64 msg_address;
 +	u32 start;
 +	u32 count;
 +};
 +
 +/* LPC Interrupt Controller */
 +
 +struct acpi_madt_lpc_pic {
 +	struct acpi_subtable_header header;
 +	u8 version;
 +	u64 address;
 +	u16 size;
 +	u8 cascade;
++
+ /* 17: OEM data */
+ 
+ struct acpi_madt_oem_data {
+ 	u8 oem_data[0];
  };
  
  /*

Attachment: pgpi0MOrUCKsk.pgp
Description: OpenPGP digital signature