---

yaml
---
r: 71579
b: refs/heads/master
c: 016ec75
h: refs/heads/master
i:
  71577: bd9e516
  71575: f015267
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6345a3a88012b0060ddeca8874e51cb442e1fb20
+refs/heads/master: 016ec75f1a0c0e765fce65d794569979104f031d

trunk/fs/cifs/cifsglob.h

@@ -499,11 +499,13 @@ require use of the stronger protocol */
 #define   CIFSSEC_MASK          0x3F03F /* allows weak security but also krb5 */
 #else
 #define   CIFSSEC_MASK          0x37037 /* current flags supported if weak */
+#endif /* UPCALL */
 #else /* do not allow weak pw hash */
 #ifdef CONFIG_CIFS_UPCALL
 #define   CIFSSEC_MASK          0x0F00F /* flags supported if no weak allowed */
 #else
 #define	  CIFSSEC_MASK          0x07007 /* flags supported if no weak allowed */
+#endif /* UPCALL */
 #endif /* WEAK_PW_HASH */
 #define   CIFSSEC_MUST_SEAL	0x40040 /* not supported yet */