linux-kernel - linux-next: manual merge of the mfd tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20241216131517.6413c3ac@canb.auug.org.au>
Date: Mon, 16 Dec 2024 13:15:17 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Lee Jones <lee@...nel.org>
Cc: Charles Keepax <ckeepax@...nsource.cirrus.com>, Linus Torvalds
 <torvalds@...ux-foundation.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Peter Zijlstra <peterz@...radead.org>
Subject: linux-next: manual merge of the mfd tree with Linus' tree

Hi all,

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

  drivers/mfd/cs42l43.c

between commit:

  cdd30ebb1b9f ("module: Convert symbol namespace to string literal")

from Linus' tree and commit:

  c5bb88eac10f ("mfd: cs42l43: Use devres for remove as well")

from the mfd 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/mfd/cs42l43.c
index b5ab5e613db7,beb63c4efd21..000000000000
--- a/drivers/mfd/cs42l43.c
+++ b/drivers/mfd/cs42l43.c
@@@ -1096,16 -1113,8 +1113,8 @@@ int cs42l43_dev_probe(struct cs42l43 *c
  
  	return 0;
  }
 -EXPORT_SYMBOL_NS_GPL(cs42l43_dev_probe, MFD_CS42L43);
 +EXPORT_SYMBOL_NS_GPL(cs42l43_dev_probe, "MFD_CS42L43");
  
- void cs42l43_dev_remove(struct cs42l43 *cs42l43)
- {
- 	cancel_work_sync(&cs42l43->boot_work);
- 
- 	cs42l43_power_down(cs42l43);
- }
- EXPORT_SYMBOL_NS_GPL(cs42l43_dev_remove, "MFD_CS42L43");
- 
  static int cs42l43_suspend(struct device *dev)
  {
  	struct cs42l43 *cs42l43 = dev_get_drvdata(dev);

Content of type "application/pgp-signature" skipped