Re: linux-next: manual merge of the rust tree with Linus' tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Re: linux-next: manual merge of the rust tree with Linus' tree
From: Miguel Ojeda <miguel.ojeda.sandonis@xxxxxxxxx>
Date: Mon, 25 Jul 2022 10:52:33 +0200
Cc: Adam Bratschi-Kaye <ark.email@xxxxxxxxx>, Alex Gaynor <alex.gaynor@xxxxxxxxx>, Antonio Terceiro <antonio.terceiro@xxxxxxxxxx>, Boqun Feng <boqun.feng@xxxxxxxxx>, Boris-Chengbiao Zhou <bobo1239@xxxxxx>, Daniel Xu <dxu@xxxxxxxxx>, Dariusz Sosnowski <dsosnowski@xxxxxxxxxxxxx>, David Gow <davidgow@xxxxxxxxxx>, Douglas Su <d0u9.su@xxxxxxxxxxx>, Finn Behrens <me@xxxxxxxxx>, Gary Guo <gary@xxxxxxxxxxx>, Josh Poimboeuf <jpoimboe@xxxxxxxxxx>, Linux Kernel Mailing List <linux-kernel@xxxxxxxxxxxxxxx>, Linux Next Mailing List <linux-next@xxxxxxxxxxxxxxx>, Michael Ellerman <mpe@xxxxxxxxxxxxxx>, Miguel Cano <macanroj@xxxxxxxxx>, Miguel Ojeda <ojeda@xxxxxxxxxx>, Peter Zijlstra <peterz@xxxxxxxxxxxxx>, Sven Van Asbroeck <thesven73@xxxxxxxxx>, Wedson Almeida Filho <wedsonaf@xxxxxxxxxx>
In-reply-to: <20220725184107.429e33bf@canb.auug.org.au>
References: <20220725184107.429e33bf@canb.auug.org.au>

On Mon, Jul 25, 2022 at 10:41 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
>   arch/x86/Makefile

Looks fine to me (I did it a bit differently on my side, but it does
not matter).

Thanks!

Cheers,
Miguel

References:
- linux-next: manual merge of the rust tree with Linus' tree
  - From: Stephen Rothwell

Prev by Date: linux-next: manual merge of the rust tree with Linus' tree
Next by Date: Re: linux-next: build failure after merge of the hid tree
Previous by thread: linux-next: manual merge of the rust tree with Linus' tree
Next by thread: linux-next: manual merge of the rust tree with Linus' tree
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel] [Linux USB Development] [Yosemite News] [Linux SCSI]