Merge tag 'bus_remove_return_void-5.15' into next
authorVinod Koul <vkoul@kernel.org>
Tue, 27 Jul 2021 13:42:14 +0000 (19:12 +0530)
committerVinod Koul <vkoul@kernel.org>
Tue, 27 Jul 2021 13:42:14 +0000 (19:12 +0530)
commitc28d5d5688c6278a1ad32670cbee35802a9e65c1
tree9ee168f44d748f04d9fdbb490fbfabb55a39b708
parent0e96454ca26cc5c594ec792f7e5168cce726f7cf
parentfc7a6209d5710618eb4f72a77cd81b8d694ecf89
Merge tag 'bus_remove_return_void-5.15' into next

This helps to remove conflict on idxd driver

 Conflicts:
drivers/dma/idxd/sysfs.c
drivers/dma/idxd/bus.c

Greg says:

Bus: Make remove callback return void tag

Tag for other trees/branches to pull from in order to have a stable
place to build off of if they want to add new busses for 5.15.

Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/idxd/bus.c