Merge branch 'linus' into x86/mm

x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 1 insertions, 0 deletions

diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index b464b9d3d242..c20d3ce673c0 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -242,6 +242,7 @@ enum {
         SCTP_DATA_FIRST_FRAG    = 0x02,
         SCTP_DATA_NOT_FRAG      = 0x03,
         SCTP_DATA_UNORDERED     = 0x04,
+        SCTP_DATA_SACK_IMM      = 0x08,
 };
 enum { SCTP_DATA_FRAG_MASK = 0x03, };