diff -Nru openafs-1.6.1/debian/changelog openafs-1.6.1/debian/changelog
--- openafs-1.6.1/debian/changelog	2014-04-10 19:00:15.000000000 +0000
+++ openafs-1.6.1/debian/changelog	2015-02-05 18:44:14.000000000 +0000
@@ -1,3 +1,11 @@
+openafs (1.6.1-1+ubuntu0.5) precise; urgency=low
+
+  * Upstream v3.2.66 porting (LP: #1416375):
+    - 'd_alias' member of struct dentry has been moved into the 'd_u' union
+  * Dropped 'single-debian-patch' from debian/source/options
+
+ -- Luis Henriques <luis.henriques@canonical.com>  Thu, 05 Feb 2015 12:44:14 -0600
+
 openafs (1.6.1-1+ubuntu0.4) precise-security; urgency=low
 
   * SECURITY UPDATE: Merge security patches from Debian Wheezy:
diff -Nru openafs-1.6.1/debian/patches/Linux-d_alias-becomes-d_u.d_alias.patch openafs-1.6.1/debian/patches/Linux-d_alias-becomes-d_u.d_alias.patch
--- openafs-1.6.1/debian/patches/Linux-d_alias-becomes-d_u.d_alias.patch	1970-01-01 00:00:00.000000000 +0000
+++ openafs-1.6.1/debian/patches/Linux-d_alias-becomes-d_u.d_alias.patch	2015-02-05 18:44:11.000000000 +0000
@@ -0,0 +1,67 @@
+## Description: struct dentry changed in kernel version 3.2.66
+##  This patch was based on the upstream solution, in the 'Origin'
+##  field
+## Origin: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=860764da5ee2e48a2c3f7552fad1766e19eae47f
+## Bug: http://bugs.launchpad.net/bugs/1416375
+Index: openafs-1.6.1/acinclude.m4
+===================================================================
+--- openafs-1.6.1.orig/acinclude.m4	2015-02-05 16:04:06.000000000 +0000
++++ openafs-1.6.1/acinclude.m4	2015-02-05 16:04:58.503171001 +0000
+@@ -793,6 +793,7 @@
+ 		 AC_CHECK_LINUX_STRUCT([backing_dev_info], [name],
+ 				       [backing-dev.h])
+ 		 AC_CHECK_LINUX_STRUCT([ctl_table], [ctl_name], [sysctl.h])
++		 AC_CHECK_LINUX_STRUCT([dentry], [d_u.d_alias], [dcache.h])
+ 		 AC_CHECK_LINUX_STRUCT([inode], [i_alloc_sem], [fs.h])
+ 		 AC_CHECK_LINUX_STRUCT([inode], [i_blkbits], [fs.h])
+ 		 AC_CHECK_LINUX_STRUCT([inode], [i_blksize], [fs.h])
+Index: openafs-1.6.1/src/afs/LINUX/osi_compat.h
+===================================================================
+--- openafs-1.6.1.orig/src/afs/LINUX/osi_compat.h	2015-02-05 16:04:06.000000000 +0000
++++ openafs-1.6.1/src/afs/LINUX/osi_compat.h	2015-02-05 16:04:58.503171001 +0000
+@@ -27,6 +27,10 @@
+ # endif
+ #endif
+ 
++#if defined(STRUCT_DENTRY_HAS_D_U_D_ALIAS)
++# define d_alias d_u.d_alias
++#endif
++
+ #ifndef HAVE_LINUX_DO_SYNC_READ
+ static inline int
+ do_sync_read(struct file *fp, char *buf, size_t count, loff_t *offp) {
+Index: openafs-1.6.1/src/afs/LINUX/osi_vcache.c
+===================================================================
+--- openafs-1.6.1.orig/src/afs/LINUX/osi_vcache.c	2012-03-27 00:03:34.000000000 +0100
++++ openafs-1.6.1/src/afs/LINUX/osi_vcache.c	2015-02-05 16:04:58.503171001 +0000
+@@ -12,6 +12,7 @@
+ 
+ #include "afs/sysincludes.h"    /*Standard vendor system headers */
+ #include "afsincludes.h"        /*AFS-based standard headers */
++#include "osi_compat.h"
+ 
+ int
+ osi_TryEvictVCache(struct vcache *avc, int *slept, int defersleep) {
+@@ -138,4 +139,3 @@
+ osi_PostPopulateVCache(struct vcache *avc) {
+     vSetType(avc, VREG);
+ }
+-
+Index: openafs-1.6.1/src/afs/afs_daemons.c
+===================================================================
+--- openafs-1.6.1.orig/src/afs/afs_daemons.c	2012-03-27 00:03:34.000000000 +0100
++++ openafs-1.6.1/src/afs/afs_daemons.c	2015-02-05 16:04:58.503171001 +0000
+@@ -396,8 +396,13 @@
+ 		    spin_lock(&dp->d_lock);
+ #endif
+ #endif
++#if defined(STRUCT_DENTRY_HAS_D_U_D_ALIAS)
++		    list_del_init(&dp->d_u.d_alias);
++		    list_add(&dp->d_u.d_alias, &(AFSTOV(vcp)->i_dentry));
++#else
+ 		    list_del_init(&dp->d_alias);
+ 		    list_add(&dp->d_alias, &(AFSTOV(vcp)->i_dentry));
++#endif
+ 		    dp->d_inode = AFSTOV(vcp);
+ #if defined(AFS_LINUX24_ENV)
+ #if defined(AFS_LINUX26_ENV)
diff -Nru openafs-1.6.1/debian/patches/series openafs-1.6.1/debian/patches/series
--- openafs-1.6.1/debian/patches/series	2014-04-10 19:00:15.000000000 +0000
+++ openafs-1.6.1/debian/patches/series	2015-02-05 18:44:11.000000000 +0000
@@ -15,3 +15,4 @@
 0013-afs-Do-not-skip-flushing-pages-for-dv-0-files.patch
 swap-libs.patch
 dsa-2899-1.patch
+Linux-d_alias-becomes-d_u.d_alias.patch
diff -Nru openafs-1.6.1/debian/source/options openafs-1.6.1/debian/source/options
--- openafs-1.6.1/debian/source/options	2012-03-29 00:25:09.000000000 +0000
+++ openafs-1.6.1/debian/source/options	2015-02-05 18:44:11.000000000 +0000
@@ -1 +0,0 @@
-single-debian-patch