From: Russ Allbery <rra@debian.org>
Date: Tue, 29 Nov 2011 01:22:34 +0000 (-0800)
Subject: Add changelog for upstream cherry-picks
X-Git-Tag: debian/1.6.0-2~1
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4181a733ccdef70a85e6a76122a6d3cacbb9ce5b;p=packages%2Fo%2Fopenafs.git

Add changelog for upstream cherry-picks
---

diff --git a/debian/changelog b/debian/changelog
index 2b51418d5..72e03b527 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
 openafs (1.6.0-2) UNRELEASED; urgency=low
 
+  * Apply upstream deltas for Linux 3.1 and 3.2 (Closes: #649765):
+    - [f129142] Linux: 3.1: update RCU path walking detection in
+      permission i_op (Closes: #649996)
+    - [7f55b45] Linux: d_delete now takes a const argument
+    - [737a280] Linux: 3.2: Use set_nlink to update i_nlink
+    - [364fad6] Linux: 3.1: adapt to fsync changes
+    - [032736b] Linux: make sure backing_dev_info is zeroed
   * Add support for armhf.  Patch from Konstantinos Margaritis.
     (Closes: #645395)