Re: [GIT PULL] Char/Misc/IIO driver changes for 6.13-rc1
From: Linus Torvalds
Date: Fri Nov 29 2024 - 15:04:22 EST
On Thu, 28 Nov 2024 at 20:45, Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> Note, there is a semi-hairy rust merge conflict when pulling this.
LOL. That was literally just one side changing "core::ffi" to
"kernel:ffi" next to some other unrelated changes. Not a big deal,
even for a rust-newbie like me.
Linus