[kernel] r18288 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/bugfix/alpha patches/bugfix/arm patches/bugfix/ia64 patches/bugfix/powerpc patches/debian patches/debian/dfsg patches/features/all patches/features/arm patches/features/x86 patches/series
Ben Hutchings
benh at alioth.debian.org
Mon Nov 14 15:49:31 UTC 2011
Author: benh
Date: Mon Nov 14 15:49:29 2011
New Revision: 18288
Log:
Update to 3.2-rc1
Drop a large number of patches that were merged upstream.
Fix context in features/all/sound-pci-cs46xx-request_firmware.patch.
Remove another firmware image sneaked into staging.
Deleted:
dists/trunk/linux-2.6/debian/patches/bugfix/all/CIFS-Fixup-trivial-checkpatch-warning.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/Fix-build-break-when-freezer-not-configured.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/PM-Freezer-Reimplement-wait_event_freezekillable-usi.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/cifs-freezer-add-wait_event_freezekillable-and-have-.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/hfs-fix-hfs_find_init-sb-ext_tree-NULL-ptr-oops.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/iwlagn-fix-modinfo-display-for-135-ucode.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/vmscan-fix-shrinker-callback-bug-in-fs-super.c.patch
dists/trunk/linux-2.6/debian/patches/bugfix/alpha/alpha-wire-up-accept4-syscall.patch
dists/trunk/linux-2.6/debian/patches/bugfix/arm/ARM-add-io-read-write-16-32-be-functions.patch
dists/trunk/linux-2.6/debian/patches/bugfix/arm/ARM-ixp4xx-gpiolib-support.patch
dists/trunk/linux-2.6/debian/patches/bugfix/ia64/ia64-gpio-GENERIC_GPIO-default-must-be-n.patch
dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/powerpc-ptrace-Fix-build-with-gcc-4.6.patch
dists/trunk/linux-2.6/debian/patches/debian/module-bug-Add-TAINT_OOT_MODULE-flag.patch
dists/trunk/linux-2.6/debian/patches/features/arm/allow_imx5x_build.patch
dists/trunk/linux-2.6/debian/patches/features/arm/imx51_pata1.patch
dists/trunk/linux-2.6/debian/patches/features/arm/imx51_pata2.patch
dists/trunk/linux-2.6/debian/patches/features/arm/imx51_pata3.patch
dists/trunk/linux-2.6/debian/patches/features/arm/imx53_ahci1.patch
dists/trunk/linux-2.6/debian/patches/features/arm/imx53_ahci2.patch
dists/trunk/linux-2.6/debian/patches/features/arm/imx53_ahci3.patch
dists/trunk/linux-2.6/debian/patches/features/arm/imx53_ahci4.patch
dists/trunk/linux-2.6/debian/patches/features/arm/imx53_ahci5.patch
dists/trunk/linux-2.6/debian/patches/features/x86/libertas-prioritize-usb8388_olpc.bin-firmware-on-OLPC-machines.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
dists/trunk/linux-2.6/debian/patches/features/all/sound-pci-cs46xx-request_firmware.patch
dists/trunk/linux-2.6/debian/patches/series/base
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Mon Nov 14 07:20:29 2011 (r18287)
+++ dists/trunk/linux-2.6/debian/changelog Mon Nov 14 15:49:29 2011 (r18288)
@@ -1,3 +1,9 @@
+linux-2.6 (3.2~rc1-1~experimental.1) UNRELEASED; urgency=low
+
+ * New upstream release candidate
+
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 14 Nov 2011 15:21:10 +0000
+
linux-2.6 (3.1.1-1) unstable; urgency=high
* New upstream stable update:
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Mon Nov 14 07:20:29 2011 (r18287)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Mon Nov 14 15:49:29 2011 (r18288)
@@ -18,6 +18,8 @@
rm drivers/staging/keucr/init.h
+rm drivers/staging/rtl8192e/r8192E_hwimg.c
+
rm drivers/staging/wlags49_h2/ap_*.c
rm drivers/staging/wlags49_h2/sta_*.c
Modified: dists/trunk/linux-2.6/debian/patches/features/all/sound-pci-cs46xx-request_firmware.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/sound-pci-cs46xx-request_firmware.patch Mon Nov 14 07:20:29 2011 (r18287)
+++ dists/trunk/linux-2.6/debian/patches/features/all/sound-pci-cs46xx-request_firmware.patch Mon Nov 14 15:49:29 2011 (r18288)
@@ -31,10 +31,10 @@
index 1be96ea..b12b930 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
-@@ -53,6 +53,7 @@
- #include <linux/slab.h>
+@@ -54,6 +54,7 @@
#include <linux/gameport.h>
#include <linux/mutex.h>
+ #include <linux/export.h>
+#include <linux/firmware.h>
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Mon Nov 14 07:20:29 2011 (r18287)
+++ dists/trunk/linux-2.6/debian/patches/series/base Mon Nov 14 15:49:29 2011 (r18288)
@@ -22,7 +22,6 @@
+ bugfix/powerpc/lpar-console.patch
+ debian/sysrq-mask.patch
-+ debian/module-bug-Add-TAINT_OOT_MODULE-flag.patch
+ debian/arch-sh4-fix-uimage-build.patch
@@ -40,36 +39,13 @@
+ features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
+ debian/cgroups-Document-the-Debian-memory-resource-controll.patch
+ bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch
-+ bugfix/ia64/ia64-gpio-GENERIC_GPIO-default-must-be-n.patch
-+ features/x86/libertas-prioritize-usb8388_olpc.bin-firmware-on-OLPC-machines.patch
-+ bugfix/arm/ARM-ixp4xx-gpiolib-support.patch
+ bugfix/all/ark3116-initialisation-fix.patch
+ bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink.patch
+ bugfix/all/xfs-fix-memory-corruption-in-xfs_readlink-2.patch
+ bugfix/all/oom-fix-integer-overflow-of-points-in-oom_badness.patch
-+ bugfix/alpha/alpha-wire-up-accept4-syscall.patch
-+ bugfix/all/iwlagn-fix-modinfo-display-for-135-ucode.patch
-+ bugfix/powerpc/powerpc-ptrace-Fix-build-with-gcc-4.6.patch
-+ bugfix/arm/ARM-add-io-read-write-16-32-be-functions.patch
-+ bugfix/all/cifs-freezer-add-wait_event_freezekillable-and-have-.patch
-+ bugfix/all/CIFS-Fixup-trivial-checkpatch-warning.patch
-+ bugfix/all/Fix-build-break-when-freezer-not-configured.patch
-+ bugfix/all/PM-Freezer-Reimplement-wait_event_freezekillable-usi.patch
-+ bugfix/all/hfs-fix-hfs_find_init-sb-ext_tree-NULL-ptr-oops.patch
-+ bugfix/all/vmscan-fix-shrinker-callback-bug-in-fs-super.c.patch
+ bugfix/all/block-Always-check-length-of-all-iov-entries-in-blk_.patch
+ features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch
# Defer until we're sure about the system call number
#+ bugfix/ia64/ia64-Add-accept4-syscall.patch
+ bugfix/arm/ixp4xx_iobe.patch
-+ features/arm/allow_imx5x_build.patch
-+ features/arm/imx51_pata1.patch
-+ features/arm/imx51_pata2.patch
-+ features/arm/imx51_pata3.patch
-+ features/arm/imx53_ahci1.patch
-+ features/arm/imx53_ahci2.patch
-+ features/arm/imx53_ahci3.patch
-+ features/arm/imx53_ahci4.patch
-+ features/arm/imx53_ahci5.patch
-
More information about the Kernel-svn-changes
mailing list