Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Conflicts:
	drivers/net/wireless/iwlegacy/iwl-debugfs.c
	drivers/net/wireless/iwlegacy/iwl-rx.c
	drivers/net/wireless/iwlegacy/iwl-scan.c
	drivers/net/wireless/iwlegacy/iwl-tx.c
	include/net/bluetooth/bluetooth.h

4 files changed, 62 insertions, 7 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 31ba0fd0f36b..43298f9810fb 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -947,7 +947,7 @@ config UID16
 config SYSCTL_SYSCALL
         bool "Sysctl syscall support" if EXPERT
         depends on PROC_SYSCTL
-        default y
+        default n
         select SYSCTL
         ---help---
           sys_sysctl uses binary paths that have been found challenging
@@ -959,7 +959,7 @@ config SYSCTL_SYSCALL
           trying to save some space it is probably safe to disable this,
           making your kernel marginally smaller.
 
-          If unsure say Y here.
+          If unsure say N here.
 
 config KALLSYMS
          bool "Load all symbols for debugging/ksymoops" if EXPERT
diff --git a/init/do_mounts.c b/init/do_mounts.c
index c0851a8e030c..0f6e1d985a3b 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -28,7 +28,7 @@ int __initdata rd_doload;	/* 1 = load RAM disk, 0 = don't load */
 int root_mountflags = MS_RDONLY | MS_SILENT;
 static char * __initdata root_device_name;
 static char __initdata saved_root_name[64];
-static int __initdata root_wait;
+static int root_wait;
 
 dev_t ROOT_DEV;
 
@@ -85,12 +85,15 @@ no_match:
 
 /**
  * devt_from_partuuid - looks up the dev_t of a partition by its UUID
- * @uuid:       36 byte char array containing a hex ascii UUID
+ * @uuid:       min 36 byte char array containing a hex ascii UUID
  *
  * The function will return the first partition which contains a matching
  * UUID value in its partition_meta_info struct.  This does not search
  * by filesystem UUIDs.
  *
+ * If @uuid is followed by a "/PARTNROFF=%d", then the number will be
+ * extracted and used as an offset from the partition identified by the UUID.
+ *
  * Returns the matching dev_t on success or 0 on failure.
  */
 static dev_t devt_from_partuuid(char *uuid_str)
@@ -98,6 +101,28 @@ static dev_t devt_from_partuuid(char *uuid_str)
         dev_t res = 0;
         struct device *dev = NULL;
         u8 uuid[16];
+        struct gendisk *disk;
+        struct hd_struct *part;
+        int offset = 0;
+
+        if (strlen(uuid_str) < 36)
+                goto done;
+
+        /* Check for optional partition number offset attributes. */
+        if (uuid_str[36]) {
+                char c = 0;
+                /* Explicitly fail on poor PARTUUID syntax. */
+                if (sscanf(&uuid_str[36],
+                           "/PARTNROFF=%d%c", &offset, &c) != 1) {
+                        printk(KERN_ERR "VFS: PARTUUID= is invalid.\n"
+                         "Expected PARTUUID=<valid-uuid-id>[/PARTNROFF=%%d]\n");
+                        if (root_wait)
+                                printk(KERN_ERR
+                                     "Disabling rootwait; root= is invalid.\n");
+                        root_wait = 0;
+                        goto done;
+                }
+        }
 
         /* Pack the requested UUID in the expected format. */
         part_pack_uuid(uuid_str, uuid);
@@ -107,8 +132,21 @@ static dev_t devt_from_partuuid(char *uuid_str)
                 goto done;
 
         res = dev->devt;
-        put_device(dev);
 
+        /* Attempt to find the partition by offset. */
+        if (!offset)
+                goto no_offset;
+
+        res = 0;
+        disk = part_to_disk(dev_to_part(dev));
+        part = disk_get_part(disk, dev_to_part(dev)->partno + offset);
+        if (part) {
+                res = part_devt(part);
+                put_device(part_to_dev(part));
+        }
+
+no_offset:
+        put_device(dev);
 done:
         return res;
 }
@@ -126,6 +164,8 @@ done:
  *         used when disk name of partitioned disk ends on a digit.
  *      6) PARTUUID=00112233-4455-6677-8899-AABBCCDDEEFF representing the
  *         unique id of a partition if the partition table provides it.
+ *      7) PARTUUID=<UUID>/PARTNROFF=<int> to select a partition in relation to
+ *         a partition with a known unique id.
  *
  *      If name doesn't have fall into the categories above, we return (0,0).
  *      block_class is used to check if something is a disk name. If the disk
@@ -143,8 +183,6 @@ dev_t name_to_dev_t(char *name)
 #ifdef CONFIG_BLOCK
         if (strncmp(name, "PARTUUID=", 9) == 0) {
                 name += 9;
-                if (strlen(name) != 36)
-                        goto fail;
                 res = devt_from_partuuid(name);
                 if (!res)
                         goto fail;
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index fe9acb0ae480..887629e24c54 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -120,6 +120,20 @@ identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
         }
 
         /*
+         * Read 512 bytes further to check if cramfs is padded
+         */
+        sys_lseek(fd, start_block * BLOCK_SIZE + 0x200, 0);
+        sys_read(fd, buf, size);
+
+        if (cramfsb->magic == CRAMFS_MAGIC) {
+                printk(KERN_NOTICE
+                       "RAMDISK: cramfs filesystem found at block %d\n",
+                       start_block);
+                nblocks = (cramfsb->size + BLOCK_SIZE - 1) >> BLOCK_SIZE_BITS;
+                goto done;
+        }
+
+        /*
          * Read block 1 to test for minix and ext2 superblock
          */
         sys_lseek(fd, (start_block+1) * BLOCK_SIZE, 0);
diff --git a/init/main.c b/init/main.c
index 63f5f6f8dc3b..217ed23e9487 100644
--- a/init/main.c
+++ b/init/main.c
@@ -512,6 +512,9 @@ asmlinkage void __init start_kernel(void)
         parse_args("Booting kernel", static_command_line, __start___param,
                    __stop___param - __start___param,
                    &unknown_bootoption);
+
+        jump_label_init();
+
         /*
          * These use large bootmem allocations and must precede
          * kmem_cache_init()