diff --git a/ChangeLog b/ChangeLog
index 3b1c493..321ca11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,199156 @@
-ChangeLog is maintained by "git log".
+commit b8659b3f2ca2aa31e5ce2d5cb61051954d81e718
+Author: Shyam <srangana@redhat.com>
+Date:   Fri Jul 21 11:16:08 2017 -0400
+
+    doc: Added release notes for 3.11.2 release
+    
+    Change-Id: I03f20ace01a29cf8c22538adf4c11bddd343bc0e
+    BUG: 1466024
+    Signed-off-by: Shyam <srangana@redhat.com>
+    Reviewed-on: https://review.gluster.org/17852
+    CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
+    Smoke: Gluster Build System <jenkins@build.gluster.org>
+
+commit bec1c177d7fccaa6dbe353cb06064256bc997895
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Mon Jul 17 16:45:47 2017 +0200
+
+    nfs/nlm: keep track of the call-state and frame for notifications
+    
+    When blocking locks are used, a new frame is allocated that is used to
+    send the notification to the client once once the lock becomes
+    available. In all other cases, the frame that contains the request from
+    the client will be used for the reply.
+    
+    Because there was no way to track the different clients with their
+    requests (captured in the call-state), the call-state could be free'd
+    before the notification was sent to the client. This caused a
+    use-after-free of the call-state and could trigger segfaults of the
+    Gluster/NFS server or incorrect replies on (un)lock requests.
+    
+    By introducing a nlm4_notify_args structure, the call-state and frame
+    can be tracked better. This prevents the possibility of segfaulting when
+    the call-state is used after being free'd.
+    
+    Cherry picked from commit b81997264f079983fa02bd5fa2b3715224942b00:
+    > BUG: 1467313
+    > Change-Id: I285d2bc552f509e5145653b7a50afcff827cd612
+    > Signed-off-by: Niels de Vos <ndevos@redhat.com>
+    > Reviewed-on: https://review.gluster.org/17700
+    > Smoke: Gluster Build System <jenkins@build.gluster.org>
+    > CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
+    > Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
+    > Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
+    

More commit messages for this ChangeLog can be found at
https://forge.gluster.org/glusterfs-core/glusterfs/commits/v3.11.2
