Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/s390/net/claw.h b/drivers/s390/net/claw.h
index 005072c420d3..46d59a13db12 100644
--- a/drivers/s390/net/claw.h
+++ b/drivers/s390/net/claw.h
@@ -129,6 +129,18 @@ static inline int claw_dbf_passes(debug_info_t *dbf_grp, int level)
                 } \
         } while (0)
 
+/**
+ * Enum for classifying detected devices.
+ */
+enum claw_channel_types {
+        /* Device is not a channel  */
+        claw_channel_type_none,
+
+        /* Device is a CLAW channel device */
+        claw_channel_type_claw
+};
+
+
 /*******************************************************
 *  Define Control Blocks                               *
 *                                                      *