[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAHk-=wiKW=BPcDvBAsVDemdWBR0uh09A_WMOCoceqj3w3doGJg@mail.gmail.com>
Date: Fri, 30 May 2025 10:05:58 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Wolfram Sang <wsa@...nel.org>, Linus Torvalds <torvalds@...ux-foundation.org>,
linux-i2c@...r.kernel.org, linux-kernel@...r.kernel.org,
Bartosz Golaszewski <brgl@...ev.pl>, Andi Shyti <andi.shyti@...nel.org>
Subject: Re: [PULL REQUEST] i2c-for-6.16-rc1
On Fri, 30 May 2025 at 09:12, Wolfram Sang <wsa@...nel.org> wrote:
>
> this pull-request will have a merge conflict with the media-tree. You
> can find a resolution from the author of the I2C changes here [1]. The
> diff there is mangled, sadly. I already asked for a better version. Hope
> it arrived when you process this request.
Oh, that resolution was wrong in other ways than just being mangled.
That
mutex_destroy(&rxport->aliased_addrs_lock);
is wrong - it needs to be "mutex_destroy(&it.export..."
Linus
Powered by blists - more mailing lists