Re: linux-next: manual merge of the efi-lock-down tree with the modules tree

From: David Howells
Date: Tue Apr 17 2018 - 03:46:23 EST

Next message: Baolin Wang: "Re: [PATCH 2/2] input: misc: Add Spreadtrum vibrator driver"
Previous message: Rahul Lakkireddy: "[PATCH net-next v4 2/3] vmcore: append device dumps to vmcore as elf notes"
In reply to: Stephen Rothwell: "linux-next: manual merge of the efi-lock-down tree with the modules tree"
Next in thread: Stephen Rothwell: "Re: linux-next: manual merge of the efi-lock-down tree with the modules tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Today's linux-next merge of the efi-lock-down tree got a conflict in:

Can you drop my branch for the moment?

Thanks,
David

Next message: Baolin Wang: "Re: [PATCH 2/2] input: misc: Add Spreadtrum vibrator driver"
Previous message: Rahul Lakkireddy: "[PATCH net-next v4 2/3] vmcore: append device dumps to vmcore as elf notes"
In reply to: Stephen Rothwell: "linux-next: manual merge of the efi-lock-down tree with the modules tree"
Next in thread: Stephen Rothwell: "Re: linux-next: manual merge of the efi-lock-down tree with the modules tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]