Merge tag 'ib-mfd-many-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee...

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.

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/input/joystick/xpad.c
Simple merge

diff --cc drivers/input/mouse/elan_i2c_core.c
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc include/linux/kobject.h
Simple merge

diff --cc lib/kobject_uevent.c
index 4682e8545b5c1a702999664332e6b98c0dabe9ce,719c155fce2084fc8e817afc007549a06eec92b5..e590523ea4761425df5e112a2c2aab873dbaa90d
--- 1/lib/kobject_uevent.c
--- 2/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'))