linux-next: manual merge of the scmi tree with the arm-soc tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Sudeep Holla <sudeep.holla@arm.com>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc: ARM <linux-arm-kernel@lists.infradead.org>,
	Cristian Marussi <cristian.marussi@arm.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Sibi Sankar <quic_sibis@quicinc.com>
Subject: linux-next: manual merge of the scmi tree with the arm-soc tree
Date: Tue, 15 Aug 2023 10:37:50 +1000	[thread overview]
Message-ID: <20230815103750.18868b76@canb.auug.org.au> (raw)

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

Hi all,

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

  drivers/firmware/arm_scmi/perf.c

between commit:

  31c7c1397a33 ("firmware: arm_scmi: Add v3.2 perf level indexing mode support")

from the arm-soc tree and commit:

  3453de1ec6e4 ("firmware: arm_scmi: Fixup perf power-cost/microwatt support")

from the scmi 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/firmware/arm_scmi/perf.c
index c0cd556fbaae,b887d57aa446..000000000000

--- a/drivers/firmware/arm_scmi/perf.c
+++ b/drivers/firmware/arm_scmi/perf.c
@@@ -1092,20 -833,13 +1094,18 @@@ static int scmi_perf_protocol_init(cons
  	for (domain = 0; domain < pinfo->num_domains; domain++) {
  		struct perf_dom_info *dom = pinfo->dom_info + domain;
  
 -		scmi_perf_domain_attributes_get(ph, domain, dom, version);
 -		scmi_perf_describe_levels_get(ph, domain, dom);
 +		dom->id = domain;
 +		scmi_perf_domain_attributes_get(ph, dom, version);
 +		scmi_perf_describe_levels_get(ph, dom, version);
  
  		if (dom->perf_fastchannels)
 -			scmi_perf_domain_init_fc(ph, domain, &dom->fc_info);
 +			scmi_perf_domain_init_fc(ph, dom->id, &dom->fc_info);
  	}
  
 +	ret = devm_add_action_or_reset(ph->dev, scmi_perf_xa_destroy, pinfo);
 +	if (ret)
 +		return ret;
 +
- 	pinfo->version = version;
- 
  	return ph->set_priv(ph, pinfo);
  }
  

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