[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CANiq72kYUEsDDym8=X7Et4YtSoaUTfLTpi6EVrpmz6M-sKTFDA@mail.gmail.com>
Date: Tue, 14 Jan 2025 09:38:59 +0100
From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Miguel Ojeda <ojeda@...nel.org>, Greg KH <greg@...ah.com>, Danilo Krummrich <dakr@...nel.org>,
Fabien Parent <fabien.parent@...aro.org>, Gary Guo <gary@...yguo.net>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>, Wedson Almeida Filho <wedsonaf@...il.com>,
Xiangfei Ding <dingxiangfei2009@...il.com>
Subject: Re: linux-next: manual merge of the rust tree with the driver-core tree
On Tue, Jan 14, 2025 at 5:37 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
> rust/kernel/lib.rs
>
> between commit:
>
> 9b90864bb42b ("rust: implement `IdArray`, `IdTable` and `RawDeviceId`")
>
> from the driver-core tree and commit:
>
> 47cb6bf7860c ("rust: use derive(CoercePointee) on rustc >= 1.84.0")
>
> from the rust tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
Looks good to me, thanks!
Cheers,
Miguel
Powered by blists - more mailing lists