Merge tag 'bus_remove_return_void-5.15' of git://git.kernel.org/pub/scm/linux/kernel...
authorDave Airlie <airlied@redhat.com>
Tue, 10 Aug 2021 19:06:46 +0000 (05:06 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 10 Aug 2021 22:47:08 +0000 (08:47 +1000)
commit9efba20291f2e816e9c043875bf4e1f0f1416c63
tree94fb01ad9081a6cc06582fb15c311670bc06531d
parent49f7844b08844ac7029f997702099c552566262b
parentfc7a6209d5710618eb4f72a77cd81b8d694ecf89
Merge tag 'bus_remove_return_void-5.15' of git://git./linux/kernel/git/gregkh/driver-core into drm-next

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
[airlied: fixed up merge conflict in drm]
From:   Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://patchwork.freedesktop.org/patch/msgid/YPkwQwf0dUKnGA7L@kroah.com
drivers/base/auxiliary.c
drivers/gpu/drm/drm_dp_aux_bus.c