Re: [GIT PULL] Char/Misc/IIO driver driver updates for 7.3-rc1

[Miguel Ojeda]

On Tue, 25 Aug 2026 13:15:35 +0200 Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> On Tue, Aug 25, 2026 at 01:14:22PM +0200, Greg KH wrote:
> >
> > All of these have been in linux-next for a while, with the only reported
> > issues being some major merge conflicts.  Miguel pointed out some of
> > these with the Rust tree merge, which is the majority of them.  I'll
> > follow up with a diffstat of the merge resolution I made against your
> > most recent tree, which works for me.
>
> And here below is my merge resolution.  Watchout for the
> drivers/android/binder/netlink.rs fixup that is needed to get things to
> build properly.  It's not a merge conflict, but still is required due to
> the module ownership changes coming from the rust tree.

Looks good to me -- I did it on my side and I also checked that it
matches what we have in linux-next.

The only difference is that here:

     +        LockClassKey, //
     +    }, //
    +     types::Opaque, //

we can already remove the `//` in the middle, i.e.

     +        LockClassKey, //
     +    },
    +     types::Opaque, //

Thanks!

Cheers,
Miguel