linux-next: manual merge of the dmaengine tree with the driver-core tree

[Stephen Rothwell]

Hi all,

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

  drivers/dma/idxd/sysfs.c

between commit:

  fc7a6209d571 ("bus: Make remove callback return void")

from the driver-core tree and commit:

  d9e5481fca74 ("dmaengine: dsa: move dsa_bus_type out of idxd driver to standalone")

from the dmaengine tree.

I fixed it up (the latter moved the code updtaed by the former,
so I added the following merge fix patch) 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.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 23 Jul 2021 15:49:33 +1000
Subject: [PATCH] fixup for "bus: Make remove callback return void"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/dma/idxd/bus.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/dma/idxd/bus.c b/drivers/dma/idxd/bus.c
index 02837f0fb3e4..6f84621053c6 100644
--- a/drivers/dma/idxd/bus.c
+++ b/drivers/dma/idxd/bus.c
@@ -58,14 +58,13 @@ static int idxd_config_bus_probe(struct device *dev)
 	return idxd_drv->probe(idxd_dev);
 }
 
-static int idxd_config_bus_remove(struct device *dev)
+static void idxd_config_bus_remove(struct device *dev)
 {
 	struct idxd_device_driver *idxd_drv =
 		container_of(dev->driver, struct idxd_device_driver, drv);
 	struct idxd_dev *idxd_dev = confdev_to_idxd_dev(dev);
 
 	idxd_drv->remove(idxd_dev);
-	return 0;
 }
 
 struct bus_type dsa_bus_type = {
-- 
2.30.2

-- 
Cheers,
Stephen Rothwell

Attachment: pgpjfhUcysIar.pgp
Description: OpenPGP digital signature