[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CANiq72mSELMEopwaRvxjSn-t1-9+uDm23_rFscuKSRR15LK1vQ@mail.gmail.com>
Date: Tue, 1 Jul 2025 11:12:16 +0200
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>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>, Tamir Duberstein <tamird@...il.com>,
Viresh Kumar <viresh.kumar@...aro.org>
Subject: Re: linux-next: manual merge of the rust tree with the driver-core tree
On Tue, Jul 1, 2025 at 9:46 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Maybe not all the above commits are involved ...
>
> I used the former version (since it changed things so much) and then
> added the changes from the latter by hand where I could. I ended up
> with the below diff compared to te HEAD before the merge.
Sounds reasonable -- I did a quick merge of just rust-next into
driver-core and I saw a few conflicts, yeah.
The diff seems OK, but I can take a better look when the tag is out.
Thanks!
Cheers,
Miguel
Powered by blists - more mailing lists