Merge branch 'master' into net-next

2016-12-12 15:24:40 -08:00 · 2016-12-12 15:24:40 -08:00 · 2a56c090e4
parent eebc7cc192 ae0969c893
commit 2a56c090e4
2 changed files with 2 additions and 1 deletions
--- a/include/SNAPSHOT.h
+++ b/include/SNAPSHOT.h
@ -1 +1 @@
-static const char SNAPSHOT[] = "161009";
+static const char SNAPSHOT[] = "161212";
--- a/include/linux/can.h
+++ b/include/linux/can.h
@ -196,5 +196,6 @@ struct can_filter {
 };

 #define CAN_INV_FILTER 0x20000000U /* to be set in can_filter.can_id */
+#define CAN_RAW_FILTER_MAX 512 /* maximum number of can_filter set via setsockopt() */

 #endif /* !_UAPI_CAN_H */