From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Nov 2015 05:50:37 +0000 (-0800)
Subject: Merge tag 'driver-core-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e880e87488d5bbf630dd716e6de8a53585614568;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'driver-core-4.4-rc1' of git://git./linux/kernel/git/gregkh/driver-core

Pull driver core updates from Greg KH:
 "Here's the "big" driver core updates for 4.4-rc1.  Primarily a bunch
  of debugfs updates, with a smattering of minor driver core fixes and
  updates as well.

  All have been in linux-next for a long time"

* tag 'driver-core-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  debugfs: Add debugfs_create_ulong()
  of: to support binding numa node to specified device in devicetree
  debugfs: Add read-only/write-only bool file ops
  debugfs: Add read-only/write-only size_t file ops
  debugfs: Add read-only/write-only x64 file ops
  debugfs: Consolidate file mode checks in debugfs_create_*()
  Revert "mm: Check if section present during memory block (un)registering"
  driver-core: platform: Provide helpers for multi-driver modules
  mm: Check if section present during memory block (un)registering
  devres: fix a for loop bounds check
  CMA: fix CONFIG_CMA_SIZE_MBYTES overflow in 64bit
  base/platform: assert that dev_pm_domain callbacks are called unconditionally
  sysfs: correctly handle short reads on PREALLOC attrs.
  base: soc: siplify ida usage
  kobject: move EXPORT_SYMBOL() macros next to corresponding definitions
  kobject: explain what kobject's sd field is
  debugfs: document that debugfs_remove*() accepts NULL and error values
  debugfs: Pass bool pointer to debugfs_create_bool()
  ACPI / EC: Fix broken 64bit big-endian users of 'global_lock'
---

e880e87488d5bbf630dd716e6de8a53585614568
diff --cc include/linux/edac.h
index b3d87e5822f8,7c6b7ba55589..4fe67b853de0
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@@ -769,10 -769,12 +769,10 @@@ struct mem_ctl_info 
  	/* the internal state of this controller instance */
  	int op_state;
  
 -#ifdef CONFIG_EDAC_DEBUG
  	struct dentry *debugfs;
  	u8 fake_inject_layer[EDAC_MAX_LAYERS];
- 	u32 fake_inject_ue;
+ 	bool fake_inject_ue;
  	u16 fake_inject_count;
 -#endif
  };
  
  /*