From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Mar 2016 20:47:50 +0000 (-0700)
Subject: Merge tag 'char-misc-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8eee93e2576c303b6071368456dcd6c9a5a021c9;p=deliverable%2Flinux.git

Merge tag 'char-misc-4.6-rc1' of git://git./linux/kernel/git/gregkh/char-misc

Pull char/misc updates from Greg KH:
 "Here is the big char/misc driver update for 4.6-rc1.

  The majority of the patches here is hwtracing and some new mic
  drivers, but there's a lot of other driver updates as well.  Full
  details in the shortlog.

  All have been in linux-next for a while with no reported issues"

* tag 'char-misc-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (238 commits)
  goldfish: Fix build error of missing ioremap on UM
  nvmem: mediatek: Fix later provider initialization
  nvmem: imx-ocotp: Fix return value of imx_ocotp_read
  nvmem: Fix dependencies for !HAS_IOMEM archs
  char: genrtc: replace blacklist with whitelist
  drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular
  drivers: char: mem: fix IS_ERROR_VALUE usage
  char: xillybus: Fix internal data structure initialization
  pch_phub: return -ENODATA if ROM can't be mapped
  Drivers: hv: vmbus: Support kexec on ws2012 r2 and above
  Drivers: hv: vmbus: Support handling messages on multiple CPUs
  Drivers: hv: utils: Remove util transport handler from list if registration fails
  Drivers: hv: util: Pass the channel information during the init call
  Drivers: hv: vmbus: avoid unneeded compiler optimizations in vmbus_wait_for_unload()
  Drivers: hv: vmbus: remove code duplication in message handling
  Drivers: hv: vmbus: avoid wait_for_completion() on crash
  Drivers: hv: vmbus: don't loose HVMSG_TIMER_EXPIRED messages
  misc: at24: replace memory_accessor with nvmem_device_read
  eeprom: 93xx46: extend driver to plug into the NVMEM framework
  eeprom: at25: extend driver to plug into the NVMEM framework
  ...
---

8eee93e2576c303b6071368456dcd6c9a5a021c9
diff --cc drivers/misc/lkdtm.c
index 2a6eaf1122b4,fb354e8a1265..5f1a36b8fbb0
--- a/drivers/misc/lkdtm.c
+++ b/drivers/misc/lkdtm.c
@@@ -103,8 -106,8 +106,9 @@@ enum ctype 
  	CT_EXEC_USERSPACE,
  	CT_ACCESS_USERSPACE,
  	CT_WRITE_RO,
 +	CT_WRITE_RO_AFTER_INIT,
  	CT_WRITE_KERN,
+ 	CT_WRAP_ATOMIC
  };
  
  static char* cp_name[] = {
@@@ -141,8 -147,8 +148,9 @@@ static char* cp_type[] = 
  	"EXEC_USERSPACE",
  	"ACCESS_USERSPACE",
  	"WRITE_RO",
 +	"WRITE_RO_AFTER_INIT",
  	"WRITE_KERN",
+ 	"WRAP_ATOMIC"
  };
  
  static struct jprobe lkdtm;