Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...

* topic/uek-4.1/upstream-cherry-picks:
  Btrfs: fix crash on fsync when using overlayfs v4
  vfio/pci: Hide broken INTx support from user
  crypto: cryptd - Assign statesize properly
  crypto: ghash-clmulni - Fix load failure
  USB: digi_acceleport: do sanity checking for the number of ports
  ksplice: add sysctls for determining Ksplice features.
  signal: protect SIGNAL_UNKILLABLE from unintentional clearing.

Conflicts:
	kernel/Makefile
	kernel/sysctl.c

diff --cc arch/Kconfig
Simple merge

diff --cc arch/x86/crypto/ghash-clmulni-intel_glue.c
Simple merge

diff --cc crypto/cryptd.c
Simple merge

diff --cc drivers/vfio/pci/vfio_pci.c
Simple merge

diff --cc fs/btrfs/file.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/Makefile
index 3a5e54c0c2caf975f4a1cc8dc67ddbfcba1633aa,2acadd96d151fc8617011a94d2d36d627d029a56..1a734181c53bde89abc553b2b9ebcefac0d1758c
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -99,15 -98,10 +99,16 @@@ obj-$(CONFIG_CRASH_DUMP) += crash_dump.
  obj-$(CONFIG_JUMP_LABEL) += jump_label.o
  obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o
  obj-$(CONFIG_TORTURE_TEST) += torture.o
 +obj-$(CONFIG_DTRACE) += dtrace/
 +obj-$(CONFIG_CTF) += ctf/
+ obj-$(CONFIG_KSPLICE) += ksplice.o
  
 +obj-$(CONFIG_HAS_IOMEM) += memremap.o
 +
  $(obj)/configs.o: $(obj)/config_data.h
  
 +$(obj)/modsign_uefi.o: KBUILD_CFLAGS += -fshort-wchar
 +
  # config_data.h contains the same information as ikconfig.h but gzipped.
  # Info from config_data can be extracted from /proc/config*
  targets += config_data.gz

diff --cc kernel/signal.c
Simple merge

diff --cc kernel/sysctl.c
index 10ff62f5ea58670d7ff7d116072f3f66386a397d,43c49bd30ea150ae148a96266e167566fcb81a4a..744c70c6f82c1d6bcdd9dc4bce0e233e78b79f5c
--- 1/kernel/sysctl.c
--- 2/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -1141,14 -1142,12 +1142,21 @@@ static struct ctl_table kern_table[] = 
                .extra1         = &zero,
                .extra2         = &one,
        },
 +#if defined(CONFIG_SPARC64)
 +      {
 +              .procname       = "mcd_on_by_default",
 +              .data           = &mcd_on_by_default,
 +              .maxlen         = sizeof(int),
 +              .mode           = 0644,
 +              .proc_handler   = proc_dointvec,
 +      },
++#endif
+ #ifdef CONFIG_KSPLICE
+       {
+               .procname       = "ksplice",
+               .mode           = 0555,
+               .child          = ksplice_sysctls,
+       },
  #endif
        { }
  };