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

[Matt Fleming]

On Wed, 2013-02-13 at 13:05 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the ia64 tree got a conflict in
> drivers/firmware/efivars.c between commit 83e68189745a ("efi: Make
> 'efi_enabled' a function to query EFI facilities") from the  tree and
> commit a93bc0c6e07e ("efi_pstore: Introducing workqueue updating sysfs")
> from the ia64 tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks Stephen, this is all correct.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/