diff options
| author | Vinod Koul <vkoul@kernel.org> | 2021-07-27 19:12:14 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2021-07-27 19:12:14 +0530 |
| commit | c28d5d5688c6278a1ad32670cbee35802a9e65c1 (patch) | |
| tree | 9ee168f44d748f04d9fdbb490fbfabb55a39b708 /drivers/dma/xilinx | |
| parent | 0e96454ca26cc5c594ec792f7e5168cce726f7cf (diff) | |
| parent | fc7a6209d5710618eb4f72a77cd81b8d694ecf89 (diff) | |
| download | linux-c28d5d5688c6278a1ad32670cbee35802a9e65c1.tar.bz2 | |
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>
Diffstat (limited to 'drivers/dma/xilinx')
0 files changed, 0 insertions, 0 deletions