Merge upstream into ieee80211.

Hand-fix merge conflict in drivers/usb/net/zd1201.c.

1 files changed, 2 insertions, 0 deletions

diff --git a/fs/ioprio.c b/fs/ioprio.c
index 97e1f088ba00..d1c1f2b2c9da 100644
--- a/fs/ioprio.c
+++ b/fs/ioprio.c
@@ -62,6 +62,8 @@ asmlinkage long sys_ioprio_set(int which, int who, int ioprio)
 
                         break;
                 case IOPRIO_CLASS_IDLE:
+                        if (!capable(CAP_SYS_ADMIN))
+                                return -EPERM;
                         break;
                 default:
                         return -EINVAL;