From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Fri, 8 Jul 2016 21:14:03 +0000 (-0300)
Subject: Merge tag 'v4.7-rc6' into patchwork
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fb810cb5eda8c47e3afbb45ea6b9676841d29e8d;p=linux.git

Merge tag 'v4.7-rc6' into patchwork

Linux 4.7-rc6

* tag 'v4.7-rc6': (1245 commits)
  Linux 4.7-rc6
  ovl: warn instead of error if d_type is not supported
  MIPS: Fix possible corruption of cache mode by mprotect.
  locks: use file_inode()
  usb: dwc3: st: Use explicit reset_control_get_exclusive() API
  phy: phy-stih407-usb: Use explicit reset_control_get_exclusive() API
  phy: miphy28lp: Inform the reset framework that our reset line may be shared
  namespace: update event counter when umounting a deleted dentry
  9p: use file_dentry()
  lockd: unregister notifier blocks if the service fails to come up completely
  ACPI,PCI,IRQ: correct operator precedence
  fuse: serialize dirops by default
  drm/i915: Fix missing unlock on error in i915_ppgtt_info()
  powerpc: Initialise pci_io_base as early as possible
  mfd: da9053: Fix compiler warning message for uninitialised variable
  mfd: max77620: Fix FPS switch statements
  phy: phy-stih407-usb: Inform the reset framework that our reset line may be shared
  usb: dwc3: st: Inform the reset framework that our reset line may be shared
  usb: host: ehci-st: Inform the reset framework that our reset line may be shared
  usb: host: ohci-st: Inform the reset framework that our reset line may be shared
  ...
---

fb810cb5eda8c47e3afbb45ea6b9676841d29e8d
diff --cc include/linux/of_reserved_mem.h
index 1779cda99ef7c,c201060e0c6da..f8e1992d6423c
--- a/include/linux/of_reserved_mem.h
+++ b/include/linux/of_reserved_mem.h
@@@ -29,11 -28,16 +29,18 @@@ typedef int (*reservedmem_of_init_fn)(s
  	_OF_DECLARE(reservedmem, name, compat, init, reservedmem_of_init_fn)
  
  #ifdef CONFIG_OF_RESERVED_MEM
 -int of_reserved_mem_device_init(struct device *dev);
 +
 +int of_reserved_mem_device_init_by_idx(struct device *dev,
 +				       struct device_node *np, int idx);
  void of_reserved_mem_device_release(struct device *dev);
  
+ int early_init_dt_alloc_reserved_memory_arch(phys_addr_t size,
+ 					     phys_addr_t align,
+ 					     phys_addr_t start,
+ 					     phys_addr_t end,
+ 					     bool nomap,
+ 					     phys_addr_t *res_base);
+ 
  void fdt_init_reserved_mem(void);
  void fdt_reserved_mem_save_node(unsigned long node, const char *uname,
  			       phys_addr_t base, phys_addr_t size);