linux-next: manual merge of the drivers-x86 tree with Linus' tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  drivers/platform/x86/amd/pmf/core.c

between commit:

  11e298f3548a ("platform/x86/amd/pmf: Fix TEE enact command failure after suspend and resume")

from Linus' tree and commit:

  6eacd474b8be ("platform/x86/amd/pmf: Add support to notify sbios heart beat event")

from the drivers-x86 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 drivers/platform/x86/amd/pmf/core.c
index 4f734e049f4a,53c0f61e5c5f..000000000000
--- a/drivers/platform/x86/amd/pmf/core.c
+++ b/drivers/platform/x86/amd/pmf/core.c
@@@ -296,9 -297,11 +297,12 @@@ static int amd_pmf_suspend_handler(stru
  {
  	struct amd_pmf_dev *pdev = dev_get_drvdata(dev);
  
 -	kfree(pdev->buf);
 +	if (pdev->smart_pc_enabled)
 +		cancel_delayed_work_sync(&pdev->pb_work);
  
+ 	if (is_apmf_func_supported(pdev, APMF_FUNC_SBIOS_HEARTBEAT_V2))
+ 		amd_pmf_notify_sbios_heartbeat_event_v2(pdev, ON_SUSPEND);
+ 
  	return 0;
  }
  
@@@ -313,9 -316,9 +317,12 @@@ static int amd_pmf_resume_handler(struc
  			return ret;
  	}
  
+ 	if (is_apmf_func_supported(pdev, APMF_FUNC_SBIOS_HEARTBEAT_V2))
+ 		amd_pmf_notify_sbios_heartbeat_event_v2(pdev, ON_RESUME);
+ 
 +	if (pdev->smart_pc_enabled)
 +		schedule_delayed_work(&pdev->pb_work, msecs_to_jiffies(2000));
 +
  	return 0;
  }
  

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