linux-next: manual merge of the tip tree with the pci tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Chen,
	Gong" <gong.chen@linux.intel.com>,
	Tony Luck <tony.luck@intel.com>,
	Bjorn Helgaas <bhelgaas@google.com>
Subject: linux-next: manual merge of the tip tree with the pci tree
Date: Tue, 29 Oct 2013 17:33:11 +1100	[thread overview]
Message-ID: <20131029173311.1872490e2255157a5528d405@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
include/linux/acpi.h between commit c8678473609b ("ACPI: Tidy acpi_run_osc
() declarations") from the pci tree and commit 4b3db708b114 ("ACPI, x86:
Extended error log driver for x86 platform") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/acpi.h
index 35e68358ad06,c30bac8503bc..000000000000

--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -294,33 -294,32 +294,34 @@@ void __init acpi_nvs_nosave_s3(void)
  #endif /* CONFIG_PM_SLEEP */
  
  struct acpi_osc_context {
 -	char *uuid_str; /* uuid string */
 +	char *uuid_str;			/* UUID string */
  	int rev;
 -	struct acpi_buffer cap; /* arg2/arg3 */
 -	struct acpi_buffer ret; /* free by caller if success */
 +	struct acpi_buffer cap;		/* list of DWORD capabilities */
 +	struct acpi_buffer ret;		/* free by caller if success */
  };
  
 -#define OSC_QUERY_TYPE			0
 -#define OSC_SUPPORT_TYPE 		1
 -#define OSC_CONTROL_TYPE		2
 -
 -/* _OSC DW0 Definition */
 -#define OSC_QUERY_ENABLE		1
 -#define OSC_REQUEST_ERROR		2
 -#define OSC_INVALID_UUID_ERROR		4
 -#define OSC_INVALID_REVISION_ERROR	8
 -#define OSC_CAPABILITIES_MASK_ERROR	16
 -
+ acpi_status acpi_str_to_uuid(char *str, u8 *uuid);
  acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);
  
 -/* platform-wide _OSC bits */
 -#define OSC_SB_PAD_SUPPORT		1
 -#define OSC_SB_PPC_OST_SUPPORT		2
 -#define OSC_SB_PR3_SUPPORT		4
 -#define OSC_SB_HOTPLUG_OST_SUPPORT	8
 -#define OSC_SB_APEI_SUPPORT		16
 +/* Indexes into _OSC Capabilities Buffer (DWORDs 2 & 3 are device-specific) */
 +#define OSC_QUERY_DWORD				0	/* DWORD 1 */
 +#define OSC_SUPPORT_DWORD			1	/* DWORD 2 */
 +#define OSC_CONTROL_DWORD			2	/* DWORD 3 */
 +
 +/* _OSC Capabilities DWORD 1: Query/Control and Error Returns (generic) */
 +#define OSC_QUERY_ENABLE			0x00000001  /* input */
 +#define OSC_REQUEST_ERROR			0x00000002  /* return */
 +#define OSC_INVALID_UUID_ERROR			0x00000004  /* return */
 +#define OSC_INVALID_REVISION_ERROR		0x00000008  /* return */
 +#define OSC_CAPABILITIES_MASK_ERROR		0x00000010  /* return */
 +
 +/* Platform-Wide Capabilities _OSC: Capabilities DWORD 2: Support Field */
 +#define OSC_SB_PAD_SUPPORT			0x00000001
 +#define OSC_SB_PPC_OST_SUPPORT			0x00000002
 +#define OSC_SB_PR3_SUPPORT			0x00000004
 +#define OSC_SB_HOTPLUG_OST_SUPPORT		0x00000008
 +#define OSC_SB_APEI_SUPPORT			0x00000010
 +#define OSC_SB_CPC_SUPPORT			0x00000020
  
  extern bool osc_sb_apei_support_acked;
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
