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
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
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.
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
> 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
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 to
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 dereference in
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
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
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 dereference in console writes) from Linus' tree and commit
faa338315985
10 matches
Mail list logo