Merge branch 'staging-linus' into staging-work

This is to pull in the lustre fixes so that others can continue to work
on updating the lustre codebase, as well as resolve some merge issues
with the ion and ocproto drivers to keep linux-next happy.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/staging/android/ion/ion_dummy_driver.c
index b89004af05ff0b8661dbfa59a3df0692c2592df5,01cdc8aee898a35cd98fc3437a31b1b066f6b92a..3a45e79fe4448fd23d4eb429d84bada0fa78449e
--- 1/drivers/staging/android/ion/ion_dummy_driver.c
--- 2/drivers/staging/android/ion/ion_dummy_driver.c
+++ b/drivers/staging/android/ion/ion_dummy_driver.c
@@@ -56,8 -58,8 +58,8 @@@ static struct ion_platform_heap dummy_h
                },
  };
  
 -struct ion_platform_data dummy_ion_pdata = {
 +static struct ion_platform_data dummy_ion_pdata = {
-       .nr = 4,
+       .nr = ARRAY_SIZE(dummy_heaps),
        .heaps = dummy_heaps,
  };
  

diff --cc drivers/staging/android/ion/ion_heap.c
index 03cc43222b50df9f70396a0b7d014feb42367f08,37e64d51394ccecb90dde57bb6f6f84be123939b..305b75ed6385d7f658b7ec3d9299ebe90e7894b5
--- 1/drivers/staging/android/ion/ion_heap.c
--- 2/drivers/staging/android/ion/ion_heap.c
+++ b/drivers/staging/android/ion/ion_heap.c
@@@ -246,9 -246,9 +246,9 @@@ int ion_heap_init_deferred_free(struct 
        if (IS_ERR(heap->task)) {
                pr_err("%s: creating thread for deferred free failed\n",
                       __func__);
 -              return PTR_RET(heap->task);
 +              return PTR_ERR_OR_ZERO(heap->task);
        }
+       sched_setscheduler(heap->task, SCHED_IDLE, &param);
        return 0;
  }
  

diff --cc drivers/staging/comedi/drivers/adv_pci1710.c
Simple merge

diff --cc drivers/staging/imx-drm/imx-hdmi.c
Simple merge

diff --cc drivers/staging/lustre/lustre/include/lustre/lustre_user.h
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/dir.c
index a6860e895d047274b73bd428bb694bc68a8bd918,52b7731bcc38679b0e4b6f1360c8a3baf7c76ac4..78ee3b118787e975a66cb161b8d6bcafd1bc6255
--- 1/drivers/staging/lustre/lustre/llite/dir.c
--- 2/drivers/staging/lustre/lustre/llite/dir.c
+++ b/drivers/staging/lustre/lustre/llite/dir.c
@@@ -1091,10 -1086,10 +1091,10 @@@ static int quotactl_ioctl(struct ll_sb_
                break;
        case Q_GETQUOTA:
                if (((type == USRQUOTA &&
-                     uid_eq(current_euid(), make_kuid(&init_user_ns, id))) ||
+                     !uid_eq(current_euid(), make_kuid(&init_user_ns, id))) ||
                     (type == GRPQUOTA &&
                      !in_egroup_p(make_kgid(&init_user_ns, id)))) &&
 -                  (!cfs_capable(CFS_CAP_SYS_ADMIN) ||
 +                  (!capable(CFS_CAP_SYS_ADMIN) ||
                     sbi->ll_flags & LL_SBI_RMT_CLIENT))
                        return -EPERM;
                break;

diff --cc drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
Simple merge

diff --cc drivers/staging/rtl8188eu/os_dep/usb_intf.c
Simple merge

diff --cc drivers/staging/usbip/vhci_sysfs.c
Simple merge