greybus: Merge branch 'master' into branch 'svc'.

This required some hand-tweaking in connection.c, hopefully I got it all
correct...

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --cc drivers/staging/greybus/connection.c
index 1a657f706b93124303151ac521d057e1a6e9cb14,88383b6e603f5183b3df680cffcb92134be80f56..ef837c50fcfbfbc9e72e0f371f18b9055c16eb3c
--- 1/drivers/staging/greybus/connection.c
--- 2/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@@ -335,6 -330,27 +335,28 @@@ void gb_connection_destroy(struct gb_co
        device_unregister(&connection->dev);
  }
  
 -      if (cport_id == GB_CONTROL_CPORT_ID)
+ static void gb_connection_disconnected(struct gb_connection *connection)
+ {
+       struct gb_control *control;
+       int cport_id = connection->intf_cport_id;
+       int ret;
+ 
+       /*
+        * Inform Interface about In-active CPorts. We don't need to do this
+        * operation for control cport.
+        */
++      if ((cport_id == GB_CONTROL_CPORT_ID) ||
++          (connection->hd_cport_id == GB_SVC_CPORT_ID))
+               return;
+ 
+       control = connection->bundle->intf->control;
+ 
+       ret = gb_control_disconnected_operation(control, cport_id);
+       if (ret)
+               dev_warn(&connection->dev,
+                       "Failed to disconnect CPort-%d (%d)\n", cport_id, ret);
+ }
+ 
  int gb_connection_init(struct gb_connection *connection)
  {
        int cport_id = connection->intf_cport_id;

diff --cc drivers/staging/greybus/greybus_protocols.h
Simple merge

diff --cc drivers/staging/greybus/svc.c
index 4bf55e0e4f3440ade912da86e6ad9806d8116574,025b2bad94280b2687b9bc6a494142afe77da1c8..16a37f22135c8dae659b88a041f7617f6a7c9da8
--- 1/drivers/staging/greybus/svc.c
--- 2/drivers/staging/greybus/svc.c
+++ b/drivers/staging/greybus/svc.c
@@@ -16,16 -11,8 +16,14 @@@
  
  struct gb_svc {
        struct gb_connection    *connection;
-       u8                      version_major;
-       u8                      version_minor;
  };
  
 +struct svc_hotplug {
 +      struct work_struct work;
 +      struct gb_connection *connection;
 +      struct gb_svc_intf_hotplug_request data;
 +};
 +
  static struct ida greybus_svc_device_id_map;
  
  /*