Re: linux-next: manual merge of the ia64 tree with Linus' tree
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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the ia64 tree with Linus' tree
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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
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
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).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/firmware/efivars.c
index f5596db,6922511..000
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@@ -790,10 -798,9 +798,10 @@@ static ssize_t efivarfs_file_write(stru
} else if (status == EFI_NOT_FOUND) {
list_del(>list);
- spin_unlock(>lock);
+ spin_unlock_irq(>lock);
efivar_unregister(var);
drop_nlink(inode);
+ d_delete(file->f_dentry);
dput(file->f_dentry);
} else {
@@@ -993,9 -1000,9 +1001,9 @@@ static int efivarfs_unlink(struct inod
if (status == EFI_SUCCESS || status == EFI_NOT_FOUND) {
list_del(>list);
- spin_unlock(>lock);
+ spin_unlock_irq(>lock);
efivar_unregister(var);
- drop_nlink(dir);
+ drop_nlink(dentry->d_inode);
dput(dentry);
return 0;
}
@@@ -1823,7 -1906,9 +1907,9 @@@ err_put
static void __exit
efivars_exit(void)
{
+ cancel_work_sync(_work);
+
- if (efi_enabled) {
+ if (efi_enabled(EFI_RUNTIME_SERVICES)) {
unregister_efivars(&__efivars);
kobject_put(efi_kobj);
}
pgpTlcYnz8WMc.pgp
Description: PGP signature
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
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).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/firmware/efivars.c
index f5596db,6922511..000
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@@ -790,10 -798,9 +798,10 @@@ static ssize_t efivarfs_file_write(stru
} else if (status == EFI_NOT_FOUND) {
list_del(var-list);
- spin_unlock(efivars-lock);
+ spin_unlock_irq(efivars-lock);
efivar_unregister(var);
drop_nlink(inode);
+ d_delete(file-f_dentry);
dput(file-f_dentry);
} else {
@@@ -993,9 -1000,9 +1001,9 @@@ static int efivarfs_unlink(struct inod
if (status == EFI_SUCCESS || status == EFI_NOT_FOUND) {
list_del(var-list);
- spin_unlock(efivars-lock);
+ spin_unlock_irq(efivars-lock);
efivar_unregister(var);
- drop_nlink(dir);
+ drop_nlink(dentry-d_inode);
dput(dentry);
return 0;
}
@@@ -1823,7 -1906,9 +1907,9 @@@ err_put
static void __exit
efivars_exit(void)
{
+ cancel_work_sync(efivar_work);
+
- if (efi_enabled) {
+ if (efi_enabled(EFI_RUNTIME_SERVICES)) {
unregister_efivars(__efivars);
kobject_put(efi_kobj);
}
pgpTlcYnz8WMc.pgp
Description: PGP signature
RE: linux-next: manual merge of the ia64 tree with Linus' tree
> 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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: manual merge of the ia64 tree with Linus' tree
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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: manual merge of the ia64 tree with Linus' tree
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; 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 console writes") from Linus' tree and commit
> faa338315985 ("efi_pstore: Add a sequence counter to a variable name") from
> the ia64 tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
>
> diff --cc fs/pstore/platform.c
> index 947fbe0,e518f43..000
> --- a/fs/pstore/platform.c
> +++ b/fs/pstore/platform.c
> @@@ -173,7 -172,7 +173,7 @@@ static void pstore_console_write(struc
> spin_lock_irqsave(>buf_lock, flags);
> }
> memcpy(psinfo->buf, s, c);
> - psinfo->write(PSTORE_TYPE_CONSOLE, 0, , 0, c, psinfo);
> -psinfo->write(PSTORE_TYPE_CONSOLE, 0, NULL, 0, 0, c, psinfo);
> ++psinfo->write(PSTORE_TYPE_CONSOLE, 0, , 0, 0, c, psinfo);
> spin_unlock_irqrestore(>buf_lock, flags);
> s += c;
> c = e - s;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
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 ("efi_pstore: Add a sequence counter to a variable name")
from the ia64 tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc fs/pstore/platform.c
index 947fbe0,e518f43..000
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@@ -173,7 -172,7 +173,7 @@@ static void pstore_console_write(struc
spin_lock_irqsave(>buf_lock, flags);
}
memcpy(psinfo->buf, s, c);
- psinfo->write(PSTORE_TYPE_CONSOLE, 0, , 0, c, psinfo);
- psinfo->write(PSTORE_TYPE_CONSOLE, 0, NULL, 0, 0, c, psinfo);
++ psinfo->write(PSTORE_TYPE_CONSOLE, 0, , 0, 0, c, psinfo);
spin_unlock_irqrestore(>buf_lock, flags);
s += c;
c = e - s;
pgpaHpZ8nRSPi.pgp
Description: PGP signature
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 (efi_pstore: Add a sequence counter to a variable name) from the ia64 tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc fs/pstore/platform.c index 947fbe0,e518f43..000 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@@ -173,7 -172,7 +173,7 @@@ static void pstore_console_write(struc spin_lock_irqsave(psinfo-buf_lock, flags); } memcpy(psinfo-buf, s, c); - psinfo-write(PSTORE_TYPE_CONSOLE, 0, id, 0, c, psinfo); - psinfo-write(PSTORE_TYPE_CONSOLE, 0, NULL, 0, 0, c, psinfo); ++ psinfo-write(PSTORE_TYPE_CONSOLE, 0, id, 0, 0, c, psinfo); spin_unlock_irqrestore(psinfo-buf_lock, flags); s += c; c = e - s; pgpaHpZ8nRSPi.pgp Description: PGP signature
RE: linux-next: manual merge of the ia64 tree with Linus' tree
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; 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 console writes) from Linus' tree and commit faa338315985 (efi_pstore: Add a sequence counter to a variable name) from the ia64 tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc fs/pstore/platform.c index 947fbe0,e518f43..000 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@@ -173,7 -172,7 +173,7 @@@ static void pstore_console_write(struc spin_lock_irqsave(psinfo-buf_lock, flags); } memcpy(psinfo-buf, s, c); - psinfo-write(PSTORE_TYPE_CONSOLE, 0, id, 0, c, psinfo); -psinfo-write(PSTORE_TYPE_CONSOLE, 0, NULL, 0, 0, c, psinfo); ++psinfo-write(PSTORE_TYPE_CONSOLE, 0, id, 0, 0, c, psinfo); spin_unlock_irqrestore(psinfo-buf_lock, flags); s += c; c = e - s; -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
