Merge branch 'master' into for-next

Conflicts:
	fs/exofs/inode.c

1 files changed, 15 insertions, 0 deletions

diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index b5afcfd0f861..140e587bc0ad 100644
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
@@ -561,3 +561,18 @@ int os_lock_file(int fd, int excl)
  out:
         return err;
 }
+
+unsigned os_major(unsigned long long dev)
+{
+        return major(dev);
+}
+
+unsigned os_minor(unsigned long long dev)
+{
+        return minor(dev);
+}
+
+unsigned long long os_makedev(unsigned major, unsigned minor)
+{
+        return makedev(major, minor);
+}