From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu, 21 Sep 2017 23:38:09 +0000 (-0700)
Subject: Merge tag 'ib-mfd-many-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=95a0c7c2d6cfde3fb5fdb713428ed0df4d6bdd58;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'ib-mfd-many-v4.14' of git://git./linux/kernel/git/lee/mfd into next

Merge "Immutable branch between MFD and many other subsystems due for
the v4.14 merge window" to get the TWL headers moved to the right place.
---

95a0c7c2d6cfde3fb5fdb713428ed0df4d6bdd58
diff --cc lib/kobject_uevent.c
index 4682e8545b5c,719c155fce20..e590523ea476
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@@ -50,23 -52,15 +52,17 @@@ static const char *kobject_actions[] = 
  	[KOBJ_MOVE] =		"move",
  	[KOBJ_ONLINE] =		"online",
  	[KOBJ_OFFLINE] =	"offline",
 +	[KOBJ_BIND] =		"bind",
 +	[KOBJ_UNBIND] =		"unbind",
  };
  
- /**
-  * kobject_action_type - translate action string to numeric type
-  *
-  * @buf: buffer containing the action string, newline is ignored
-  * @count: length of buffer
-  * @type: pointer to the location to store the action type
-  *
-  * Returns 0 if the action string was recognized.
-  */
- int kobject_action_type(const char *buf, size_t count,
- 			enum kobject_action *type)
+ static int kobject_action_type(const char *buf, size_t count,
+ 			       enum kobject_action *type,
+ 			       const char **args)
  {
  	enum kobject_action action;
+ 	size_t count_first;
+ 	const char *args_start;
  	int ret = -EINVAL;
  
  	if (count && (buf[count-1] == '\n' || buf[count-1] == '\0'))