Skip to content
Commit c28d5d56 authored by Vinod Koul's avatar Vinod Koul
Browse files

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: default avatarVinod Koul <vkoul@kernel.org>
parents 0e96454c fc7a6209
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment