public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
* linux-next: manual merge of the ia64 tree with Linus' tree
@ 2013-02-13  2:05 Stephen Rothwell
  2013-02-13 12:55 ` Matt Fleming
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2013-02-13  2:05 UTC (permalink / raw)
  To: Luck, Tony
  Cc: linux-next, linux-kernel, Matt Fleming, H. Peter Anvin,
	Seiji Aguchi

[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]

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 Rothwell                    sfr@canb•auug.org.au

diff --cc drivers/firmware/efivars.c
index f5596db,6922511..0000000
--- 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);
  	}

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the ia64 tree with Linus' tree
@ 2012-11-26  0:31 Stephen Rothwell
  2012-11-26  3:19 ` Seiji Aguchi
  2012-11-27  0:44 ` Luck, Tony
  0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2012-11-26  0:31 UTC (permalink / raw)
  To: Luck, Tony
  Cc: linux-next, linux-kernel, Colin Ian King, Anton Vorontsov,
	Seiji Aguchi

[-- Attachment #1: Type: text/plain, Size: 1001 bytes --]

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 Rothwell                    sfr@canb•auug.org.au

diff --cc fs/pstore/platform.c
index 947fbe0,e518f43..0000000
--- 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;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the ia64 tree with Linus' tree
@ 2009-09-17  1:33 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-09-17  1:33 UTC (permalink / raw)
  To: Luck, Tony; +Cc: linux-next, linux-kernel, Tejun Heo, Nelson Elhage

Hi Tony,

Today's linux-next merge of the ia64 tree got a conflict in
arch/ia64/kernel/vmlinux.lds.S between commit
023bf6f1b8bf58dc4da7f0dc1cf4787b0d5297c1 ("linker script: unify usage of
discard definition") from Linus' tree and commit
6ae86350857bf3e862f8dcd10039ccb45e056f85 ("[IA64] Clean up linker script
using standard macros") from the ia64 tree.

I fixed it up (I think - see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au

diff --cc arch/ia64/kernel/vmlinux.lds.S
index eb4214d,f69f411..0000000
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@@ -284,39 -228,8 +228,10 @@@ SECTION
    _end = .;
  
    code : { } :code
-   /* Stabs debugging sections.  */
-   .stab 0 : { *(.stab) }
-   .stabstr 0 : { *(.stabstr) }
-   .stab.excl 0 : { *(.stab.excl) }
-   .stab.exclstr 0 : { *(.stab.exclstr) }
-   .stab.index 0 : { *(.stab.index) }
-   .stab.indexstr 0 : { *(.stab.indexstr) }
-   /* DWARF debug sections.
-      Symbols in the DWARF debugging sections are relative to the beginning
-      of the section so we begin them at 0.  */
-   /* DWARF 1 */
-   .debug          0 : { *(.debug) }
-   .line           0 : { *(.line) }
-   /* GNU DWARF 1 extensions */
-   .debug_srcinfo  0 : { *(.debug_srcinfo) }
-   .debug_sfnames  0 : { *(.debug_sfnames) }
-   /* DWARF 1.1 and DWARF 2 */
-   .debug_aranges  0 : { *(.debug_aranges) }
-   .debug_pubnames 0 : { *(.debug_pubnames) }
-   /* DWARF 2 */
-   .debug_info     0 : { *(.debug_info) }
-   .debug_abbrev   0 : { *(.debug_abbrev) }
-   .debug_line     0 : { *(.debug_line) }
-   .debug_frame    0 : { *(.debug_frame) }
-   .debug_str      0 : { *(.debug_str) }
-   .debug_loc      0 : { *(.debug_loc) }
-   .debug_macinfo  0 : { *(.debug_macinfo) }
-   /* SGI/MIPS DWARF 2 extensions */
-   .debug_weaknames 0 : { *(.debug_weaknames) }
-   .debug_funcnames 0 : { *(.debug_funcnames) }
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
+ 
+   STABS_DEBUG
+   DWARF_DEBUG
 -  /DISCARD/ : { *(.note) }
 +
 +  /* Default discards */
 +  DISCARDS
  }

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-02-13 12:55 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-13  2:05 linux-next: manual merge of the ia64 tree with Linus' tree Stephen Rothwell
2013-02-13 12:55 ` Matt Fleming
  -- strict thread matches above, loose matches on Subject: below --
2012-11-26  0:31 Stephen Rothwell
2012-11-26  3:19 ` Seiji Aguchi
2012-11-27  0:44 ` Luck, Tony
2009-09-17  1:33 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox