debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

aufs2: Update to snapshot from 2010-01-25 (Closes: #567391) 

Remove conflicting whitespace change in vserver patch.

svn path=/dists/trunk/linux-2.6/; revision=15057
This commit is contained in:
Ben Hutchings 2010-01-28 22:34:03 +00:00
parent fd7685fc62
commit bbfffd32ce
7 changed files with 2870 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -50,6 +50,7 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low
(Closes: #566547)
* postinst: Enable escape sequences in debconf notes (Closes: #566539)
* Add 3w-sas driver for LSI 3ware 9750 SAS controllers
* aufs2: Update to snapshot from 2010-01-25 (Closes: #567391)
[ Ian Campbell ]
* xen: Enable up to 32G of guest memory on i386.

1
debian/config/config vendored
View File

@ -2656,6 +2656,7 @@ CONFIG_AUFS_BRANCH_MAX_127=y
# CONFIG_AUFS_HINOTIFY is not set
# CONFIG_AUFS_EXPORT is not set
# CONFIG_AUFS_RDU is not set
# CONFIG_AUFS_SP_IATTR is not set
# CONFIG_AUFS_SHWH is not set
# CONFIG_AUFS_BR_RAMFS is not set
# CONFIG_AUFS_BR_FUSE is not set

2865
debian/patches/features/all/aufs2/aufs2-20100125.patch vendored Normal file
View File

File diff suppressed because it is too large Load Diff

2
debian/patches/features/all/aufs2/aufs2-base.patch vendored
View File

@ -1,4 +1,4 @@
aufs2 base patch for linux-2.6.
aufs2 base patch for linux-2.6.32
diff --git a/fs/namei.c b/fs/namei.c
index d11f404..7d28f56 100644

2
debian/patches/features/all/aufs2/aufs2-kbuild.patch vendored
View File

@ -1,4 +1,4 @@
aufs2 kbuild patch for linux-2.6.
aufs2 kbuild patch for linux-2.6.32
diff --git a/fs/Kconfig b/fs/Kconfig
index 64d44ef..3e1f2f0 100644

5
debian/patches/features/all/vserver/vs2.3.0.36.27.patch vendored
View File

@ -28703,11 +28703,6 @@ diff -NurpP --minimal linux-2.6.32.1/security/commoncap.c linux-2.6.32.1-vs2.3.0
return -EPERM;
return 0;
}
@@ -1014,3 +1032,4 @@ int cap_file_mmap(struct file *file, uns
}
return ret;
}
+
diff -NurpP --minimal linux-2.6.32.1/security/selinux/hooks.c linux-2.6.32.1-vs2.3.0.36.27/security/selinux/hooks.c
--- linux-2.6.32.1/security/selinux/hooks.c 2009-12-03 20:03:02.000000000 +0100
+++ linux-2.6.32.1-vs2.3.0.36.27/security/selinux/hooks.c 2009-12-03 20:04:56.000000000 +0100

1
debian/patches/series/6 vendored
View File

@ -33,3 +33,4 @@
+ bugfix/all/clockevents-Dont-remove-broadcast-device.patch
+ bugfix/all/clockevents-Add-missing-include.patch
+ features/all/SCSI-3w-sas-Add-new-driver-for-LSI-3ware-9750.patch
+ features/all/aufs2/aufs2-20100125.patch