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

2013-02-13 Thread 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 ("

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

2013-02-12 Thread Stephen Rothwell
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.

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

2012-11-26 Thread Luck, Tony
> 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

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

2012-11-25 Thread Seiji Aguchi
t; Anton Vorontsov; Seiji Aguchi > Subject: linux-next: manual merge of the ia64 tree with Linus' tree > > Hi all, > > Today's linux-next merge of the ia64 tree got a conflict in > fs/pstore/platform.c between commit 70a6f46d7b0e ("pstore: Fix NULL > pointer deref

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

2012-11-25 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the ia64 tree got a conflict in fs/pstore/platform.c between commit 70a6f46d7b0e ("pstore: Fix NULL pointer dereference in console writes") from Linus' tree and commit faa338315985 ("efi_pstore: Add a sequence counter to a variable name") from the ia64 tree. I