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 <[email protected]>
Date: Fri, 23 Jul 2021 15:49:33 +1000
Subject: [PATCH] fixup for "bus: Make remove callback return void"
Signed-off-by: Stephen Rothwell <[email protected]>
---
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
Hello,
On Fri, Jul 23, 2021 at 03:53:54PM +1000, Stephen Rothwell wrote:
> 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.
Greg provided a tag for this case at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/bus_remove_return_void-5.15
. Vinod might want to rebase on top of this or merge it into his tree
with Stephen's conflict resolution.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |
On 23-07-21, 11:16, Uwe Kleine-K?nig wrote:
> Hello,
>
> On Fri, Jul 23, 2021 at 03:53:54PM +1000, Stephen Rothwell wrote:
> > 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.
>
> Greg provided a tag for this case at
>
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/bus_remove_return_void-5.15
>
> . Vinod might want to rebase on top of this or merge it into his tree
> with Stephen's conflict resolution.
Thanks I have merged the tag and resolved conflict as above.
Dave pls test
--
~Vinod
On 7/27/2021 6:44 AM, Vinod Koul wrote:
> On 23-07-21, 11:16, Uwe Kleine-König wrote:
>> Hello,
>>
>> On Fri, Jul 23, 2021 at 03:53:54PM +1000, Stephen Rothwell wrote:
>>> 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.
>> Greg provided a tag for this case at
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/bus_remove_return_void-5.15
>>
>> . Vinod might want to rebase on top of this or merge it into his tree
>> with Stephen's conflict resolution.
> Thanks I have merged the tag and resolved conflict as above.
>
> Dave pls test
Tested. Looks good. Thx.
>
Hello Stephen,
On Fri, Jul 23, 2021 at 03:53:54PM +1000, Stephen Rothwell wrote:
> 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 intended to take a look at the resolution that Vinod pushed in his
tree. To find his tree and the right branch my approach in such a
situation is usually:
uwe@taurus:~/gsrc/linux$ git name-rev d9e5481fca74
d9e5481fca74 tags/next-20210722~22^2~2
so it was merged in tags/next-20210722~22, looking at that I see:
uwe@taurus:~/gsrc/linux$ git show tags/next-20210722~22
commit 65da974af6a0d913cde0cf59f517322bceac24a7
...
Merge remote-tracking branch 'dmaengine/next'
and then I have to lookup what dmaengine/next means in next-20210722:
uwe@taurus:~/gsrc/linux$ git show next-20210722 | grep dmaen
...
+dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next
...
You could save me the last step if you used
git pull dmaengine next
instead of
git merge dmaengine/next
because then the commit message of tags/next-20210722~22 would be:
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
which is much more useful than
Merge remote-tracking branch 'dmaengine/next'
. Otherwise the result should be the same (apart from fetching the
changes a tad later maybe).
Thanks for considering
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |
Hi Uwe,
[Sorry this took so long]
On Wed, 28 Jul 2021 09:10:14 +0200 Uwe Kleine-König <[email protected]> wrote:
>
> I intended to take a look at the resolution that Vinod pushed in his
> tree. To find his tree and the right branch my approach in such a
> situation is usually:
>
> uwe@taurus:~/gsrc/linux$ git name-rev d9e5481fca74
> d9e5481fca74 tags/next-20210722~22^2~2
>
> so it was merged in tags/next-20210722~22, looking at that I see:
>
> uwe@taurus:~/gsrc/linux$ git show tags/next-20210722~22
> commit 65da974af6a0d913cde0cf59f517322bceac24a7
> ...
> Merge remote-tracking branch 'dmaengine/next'
>
> and then I have to lookup what dmaengine/next means in next-20210722:
>
> uwe@taurus:~/gsrc/linux$ git show next-20210722 | grep dmaen
> ...
> +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next
> ...
>
> You could save me the last step if you used
>
> git pull dmaengine next
>
> instead of
>
> git merge dmaengine/next
>
> because then the commit message of tags/next-20210722~22 would be:
>
> Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
>
> which is much more useful than
>
> Merge remote-tracking branch 'dmaengine/next'
>
> . Otherwise the result should be the same (apart from fetching the
> changes a tad later maybe).
Thanks for the feed back.
I prefer to fetch all the trees (and run my checking scripts across
them independently of the merge/build cycle. However, I have improved
the merge commit messages (I think). Please check out today's
linux-next. I have decided to remove the SHA1 from the message, as you
can see that from what is merged anyway.
Let me know if this is better for you.
--
Cheers,
Stephen Rothwell
Hello Stephen,
On Thu, Sep 16, 2021 at 04:27:40PM +1000, Stephen Rothwell wrote:
> [Sorry this took so long]
No problem. Thanks for picking up my suggestion (and not loosing it in
your mailbox).
> I prefer to fetch all the trees (and run my checking scripts across
> them independently of the merge/build cycle. However, I have improved
> the merge commit messages (I think). Please check out today's
> linux-next.
Looks great. Thanks.
> I have decided to remove the SHA1 from the message, as you
> can see that from what is merged anyway.
I understand that starting from tomorrow the short log will be shorter
for the merge commits.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |
Hi Uwe,
On Thu, 16 Sep 2021 11:52:29 +0200 Uwe Kleine-König <[email protected]> wrote:
>
> I understand that starting from tomorrow the short log will be shorter
> for the merge commits.
Exactly.
--
Cheers,
Stephen Rothwell