Merge branch 'linus' into timers/urgent, to pick up fixes

[cascardo/linux.git] / include / linux / errno.h

diff --git a/include/linux/errno.h b/include/linux/errno.h
index 89627b9..7ce9fb1 100644 (file)
--- a/include/linux/errno.h
+++ b/include/linux/errno.h
@@ -28,5 +28,6 @@
 #define EBADTYPE       527     /* Type not supported by server */
 #define EJUKEBOX       528     /* Request initiated, but will not complete before timeout */
 #define EIOCBQUEUED    529     /* iocb queued, will get completion event */
+#define ERECALLCONFLICT        530     /* conflict with recalled state */
 
 #endif