diff -rupN vmci-only/shared/vm_assert.h vmci-only/shared/vm_assert.h
--- vmci-only/shared/vm_assert.h        2014-03-31 18:49:14.841009422 +0100
+++ vmci-only/shared/vm_assert.h        2014-03-31 18:49:21.385009439 +0100
@@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con
                                        __FILE__, __LINE__, __FUNCTION__, \
                                        _fix))
 #else
+   #undef DEPRECATED /* in <linux/printk.h> since 3.14.0 */
    #define DEPRECATED(_fix) do {} while (0)
 #endif
 
diff -rupN vmci-only/linux/driver.c vmci-only/linux/driver.c
--- vmci-only/linux/driver.c    2014-03-31 18:49:14.840009422 +0100
+++ vmci-only/linux/driver.c    2014-03-31 18:49:21.385009439 +0100
@@ -737,7 +737,7 @@ LinuxDriver_Ioctl(struct inode *inode,
          goto init_release;
       }
 
-      user = current_uid();
+      user = from_kuid(current_user_ns(), current_uid());
       retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags,
                                        0 /* Unused */, vmciLinux->userVersion,
                                        &user, &vmciLinux->context);