Skip to content

GitLab

Commit 864bb6bb authored by J. R. Okajima's avatar J. R. Okajima
Browse files

Merge branch 'aufs5.x-rcN/00base' into aufs5.x-rcN/01modular

parents d1a5d9d6 f4062454
Hide whitespace changes
Inline Side-by-side
include/uapi/linux/aufs_type.h
View file @ 864bb6bb
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <limits.h> #include <limits.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#define AUFS_VERSION "5.5" #define AUFS_VERSION "5.x-rcN"
/* todo? move this to linux-2.6.19/include/magic.h */ /* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') #define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment