linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vinod Koul <vkoul@kernel.org>, Greg KH <greg@kroah.com>
Cc: "Dave Jiang" <dave.jiang@intel.com>,
	"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
	"Linux Next Mailing List" <linux-next@vger.kernel.org>,
	"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Subject: linux-next: manual merge of the dmaengine tree with the driver-core tree
Date: Fri, 23 Jul 2021 15:53:54 +1000	[thread overview]
Message-ID: <20210723155354.082a62d8@canb.auug.org.au> (raw)

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

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@canb.auug.org.au>
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@canb.auug.org.au>
---
 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2021-07-23  5:54 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-23  5:53 Stephen Rothwell [this message]
2021-07-23  9:16 ` Uwe Kleine-König
2021-07-27 13:44   ` Vinod Koul
2021-07-27 18:02     ` Dave Jiang
2021-07-28  7:10 ` Improvement suggestion for creation of next [Was: linux-next: manual merge of the dmaengine tree with the driver-core tree] Uwe Kleine-König
2021-09-16  6:27   ` Stephen Rothwell
2021-09-16  9:52     ` Uwe Kleine-König
2021-09-16 12:23       ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210723155354.082a62d8@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=dave.jiang@intel.com \
    --cc=greg@kroah.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=u.kleine-koenig@pengutronix.de \
    --cc=vkoul@kernel.org \
    --subject='Re: linux-next: manual merge of the dmaengine tree with the driver-core tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).