From eb6691c35b4c2960c04d87b4ddee7587cc2c8e7b Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Thu, 31 Mar 2011 14:22:33 -0700 Subject: [PATCH] Add changelog for additional upstream deltas --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7b1f3de4e..8552bfb73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ openafs (1.6.0~pre4-1) UNRELEASED; urgency=low - Document current client setuid behavior. (Closes: #612608) - Allow salvager to be run manually with demand-attach servers. - Properly report setpag() errors. + * Apply upstream deltas: + - [1e322b88] Linux: 2.6.39: deal with BKL removal + - [a8aa6f42] Linux: 2.6.39: replace path_lookup with kern_path * Declare optional dependencies in the openafs-client init script on openafs-fileserver so that, if the same host is running both a fileserver and a client, the fileserver starts before and stops after -- 2.39.5