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

From: Miguel Ojeda
Date: Mon Jul 25 2022 - 04:52:48 EST

Next message: irqchip-bot for Ben Dooks: "[irqchip: irq/irqchip-next] irqchip/mmp: Declare init functions in common header file"
Previous message: Greg Kroah-Hartman: "Re: [PATCH 0/7] USB: cdc: add control and state defines"
In reply to: Stephen Rothwell: "linux-next: manual merge of the rust tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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

Next message: irqchip-bot for Ben Dooks: "[irqchip: irq/irqchip-next] irqchip/mmp: Declare init functions in common header file"
Previous message: Greg Kroah-Hartman: "Re: [PATCH 0/7] USB: cdc: add control and state defines"
In reply to: Stephen Rothwell: "linux-next: manual merge of the rust tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]