On Mon, Jun 24, 2024 at 07:47:56PM +0200, Greg KH wrote: > On Mon, Jun 24, 2024 at 06:35:57PM +0100, Mark Brown wrote: > > diff --cc drivers/reset/reset-meson-audio-arb.c > > index 894ad9d37a665,8740f5f6abf80..0000000000000 > > --- a/drivers/reset/reset-meson-audio-arb.c > > +++ b/drivers/reset/reset-meson-audio-arb.c > No diff for the conflict? That's what happens when the merge winds up bringing in no changes.
Attachment:
signature.asc
Description: PGP signature
