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 ("
> I fixed it up (see below) and can carry the fix as necessary.
I rebased the series onto 3.7-rc7 (using the same merge fix that you did) ...
so you shouldn't see the merge error next time.
-Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message
Hi,
This fix is reasonable to me.
Thanks,
Seiji
> -Original Message-
> From: Stephen Rothwell [mailto:s...@canb.auug.org.au]
> Sent: Sunday, November 25, 2012 7:32 PM
> To: Luck, Tony
> Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org; Colin Ian King;
> Anton Vorontsov; Sei
3 matches
Mail list logo
