From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Thu, 9 Mar 2017 07:34:05 +0000 (-0800)
Subject: Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux... 
X-Git-Tag: v4.1.12-93~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=07d79b750262df0184aee55cc151315afb4a99c7;p=users%2Fjedix%2Flinux-maple.git

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

* 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
---

07d79b750262df0184aee55cc151315afb4a99c7
diff --cc kernel/Makefile
index 3a5e54c0c2caf,2acadd96d151f..1a734181c53bd
--- a/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/sysctl.c
index 10ff62f5ea586,43c49bd30ea15..744c70c6f82c1
--- a/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
  	{ }
  };