- Update to 3.2-rc3.

  - stack unwind: cfi_ignore takes more arguments.
  - iio: Fix build error in industrialio-core.c.

suse-commit: 48ef020ddf2cebe35825c7a2fbc15ab89bea8b66

diff --cc Makefile
Simple merge

diff --cc arch/powerpc/kernel/prom_init.c
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/x86/include/asm/dwarf2.h
index 1b55d9e,f6f1598..699a973
--- 1/arch/x86/include/asm/dwarf2.h
--- 2/arch/x86/include/asm/dwarf2.h
+++ b/arch/x86/include/asm/dwarf2.h
@@@ -54,7 -53,7 +54,7 @@@
   * Due to the structure of pre-exisiting code, don't use assembler line
   * comment character # to ignore the arguments. Instead, use a dummy macro.
   */
--.macro cfi_ignore a=0, b=0, c=0, d=0
++.macro cfi_ignore a=0, b=0, c=0, d=0, e=0, f=0, g=0, h=0
  .endm
  
  #define CFI_STARTPROC         cfi_ignore

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc drivers/input/serio/i8042-x86ia64io.h
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/scsi/scsi_scan.c
Simple merge

diff --cc drivers/staging/iio/industrialio-core.c
index 326e967,2656409..5367914
--- 1/drivers/staging/iio/industrialio-core.c
--- 2/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@@ -242,19 -242,27 +242,26 @@@ static const struct file_operations iio
  
  static int iio_event_getfd(struct iio_dev *indio_dev)
  {
-       if (indio_dev->event_interface == NULL)
++      struct iio_event_interface *ev_int = indio_dev->event_interface;
+       int fd;
+ 
 -      if (indio_dev->event_interface == NULL)
++      if (ev_int == NULL)
                return -ENODEV;
  
--      mutex_lock(&indio_dev->event_interface->event_list_lock);
--      if (test_and_set_bit(IIO_BUSY_BIT_POS,
--                           &indio_dev->event_interface->flags)) {
--              mutex_unlock(&indio_dev->event_interface->event_list_lock);
++      mutex_lock(&ev_int->event_list_lock);
++      if (test_and_set_bit(IIO_BUSY_BIT_POS, &ev_int->flags)) {
++              mutex_unlock(&ev_int->event_list_lock);
                return -EBUSY;
        }
--      mutex_unlock(&indio_dev->event_interface->event_list_lock);
-       return anon_inode_getfd("iio:event",
-                               &iio_event_chrdev_fileops,
-                               indio_dev->event_interface, O_RDONLY);
 -      fd = anon_inode_getfd("iio:event",
 -                              &iio_event_chrdev_fileops,
 -                              indio_dev->event_interface, O_RDONLY);
++      mutex_unlock(&ev_int->event_list_lock);
++      fd = anon_inode_getfd("iio:event", &iio_event_chrdev_fileops,
++                              ev_int, O_RDONLY);
+       if (fd < 0) {
 -              mutex_lock(&indio_dev->event_interface->event_list_lock);
++              mutex_lock(&ev_int->event_list_lock);
+               clear_bit(IIO_BUSY_BIT_POS, &ev_int->flags);
 -              mutex_unlock(&indio_dev->event_interface->event_list_lock);
++              mutex_unlock(&ev_int->event_list_lock);
+       }
+       return fd;
  }
  
  static int __init iio_init(void)

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/nfs/dir.c
Simple merge

diff --cc fs/nfs/inode.c
Simple merge

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

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

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

diff --cc net/sunrpc/xprtsock.c
Simple merge