Merge remote-tracking branch 'ia64/next'

Conflicts:
	drivers/firmware/efivars.c
	init/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/firmware/efivars.c
index f5596db0cf583dc16226bc629a42977de0f9fa05,69225115304d8ec61acd6df4c6681257443e686c..fed08b6617111e35bdfa79368b4a68781f5d55ec
--- 1/drivers/firmware/efivars.c
--- 2/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)
  {
 -      if (efi_enabled) {
+       cancel_work_sync(&efivar_work);
+ 
 +      if (efi_enabled(EFI_RUNTIME_SERVICES)) {
                unregister_efivars(&__efivars);
                kobject_put(efi_kobj);
        }

diff --cc include/linux/efi.h
Simple merge

diff --cc init/Kconfig
index 01180da49addd1a13dc43470bab3858368b1da49,523bee15fb442377646420545a105bcc5ad11245..cab5a6c0506d44d8557ed8fce3341977ad0136e6
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -1232,14 -1232,13 +1232,21 @@@ config SYSCTL_EXCEPTION_TRAC
        help
          Enable support for /proc/sys/debug/exception-trace.
  
 +config SYSCTL_ARCH_UNALIGN_ALLOW
 +      bool
 +      help
 +        Enable support for /proc/sys/kernel/unaligned-trap
 +        Allows arches to define/use @unaligned_enabled to runtime toggle
 +        the unaligned access emulation.
 +        see arch/parisc/kernel/unaligned.c for reference
 +
+ config SYSCTL_ARCH_UNALIGN_NO_WARN
+       bool
+       help
+         Enable support for /proc/sys/kernel/ignore-unaligned-usertrap
+         Allows arch to define/use @no_unaligned_warning to possibly warn
+         about unaligned access emulation going on under the hood.
+ 
  config KALLSYMS
         bool "Load all symbols for debugging/ksymoops" if EXPERT
         default y

diff --cc kernel/sysctl.c
Simple merge