Merge tag 'v4.4-rc4'

Linux 4.4-rc4

diff --combined Makefile
index 0aca10e3c575580226bf66eef3748bacf82e9389,d644f6e92cf653be39a981d7ca6b021084c7eaa5..e58b676b938afab9d94c516442865233ab7bd59c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 4
  PATCHLEVEL = 4
  SUBLEVEL = 0
- EXTRAVERSION = -rc3
+ EXTRAVERSION = -rc4
  NAME = Blurry Fish Butt
  
  # *DOCUMENTATION*
@@@ -10,8 -10,6 +10,8 @@@
  # Comments in this file are targeted only to the developer, do not
  # expect to learn how to build the kernel reading this file.
  
 +SUBLEVEL = 0
 +
  # o Do not use make's built-in rules and variables
  #   (this increases performance and avoids hard-to-debug behaviour);
  # o Look for make include files relative to root of kernel src
@@@ -250,13 -248,7 +250,13 @@@ SUBARCH := $(shell uname -m | sed -e s/
  # "make" in the configured kernel build directory always uses that.
  # Default value for CROSS_COMPILE is not to prefix executables
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
 +ARCH          ?= arm64
  ARCH          ?= $(SUBARCH)
 +ifeq ($(ARCH),arm64)
 +ifneq ($(wildcard $(srctree)/../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9),)
 +CROSS_COMPILE ?= $(srctree)/../prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/aarch64-linux-android-
 +endif
 +endif
  CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)
  
  # Architecture as present in compile.h
@@@ -365,12 -357,6 +365,12 @@@ PERL             = per
  PYTHON                = python
  CHECK         = sparse
  
 +# Use the wrapper for the compiler. This wrapper scans for new
 +# warnings and causes the build to stop upon encountering them.
 +ifneq ($(wildcard $(srctree)/scripts/gcc-wrapper.py),)
 +CC            = $(srctree)/scripts/gcc-wrapper.py $(CROSS_COMPILE)gcc
 +endif
 +
  CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
                  -Wbitwise -Wno-return-void $(CF)
  CFLAGS_MODULE   =

diff --combined block/partition-generic.c
index d12489ea720982257e188957a67757cd632cac20,746935a5973ca6c76b8f66cfff8d58ce50566994..ae95e963c5bb15df14a96b77a50c8a9302f23f53
--- 1/block/partition-generic.c
--- 2/block/partition-generic.c
+++ b/block/partition-generic.c
@@@ -216,21 -216,10 +216,21 @@@ static void part_release(struct device 
        kfree(p);
  }
  
 +static int part_uevent(struct device *dev, struct kobj_uevent_env *env)
 +{
 +      struct hd_struct *part = dev_to_part(dev);
 +
 +      add_uevent_var(env, "PARTN=%u", part->partno);
 +      if (part->info && part->info->volname[0])
 +              add_uevent_var(env, "PARTNAME=%s", part->info->volname);
 +      return 0;
 +}
 +
  struct device_type part_type = {
        .name           = "partition",
        .groups         = part_attr_groups,
        .release        = part_release,
 +      .uevent         = part_uevent,
  };
  
  static void delete_partition_rcu_cb(struct rcu_head *head)
@@@ -408,7 -397,7 +408,7 @@@ static int drop_partitions(struct gendi
        struct hd_struct *part;
        int res;
  
-       if (bdev->bd_part_count)
+       if (bdev->bd_part_count || bdev->bd_super)
                return -EBUSY;
        res = invalidate_partition(disk, 0);
        if (res)