[kernel] r14642 - in dists/trunk/linux-2.6: . debian debian/bin debian/config/armel debian/config/i386 debian/config/powerpc debian/patches/bugfix/all debian/patches/features/arm debian/patches/series debian/templates debian/templates/image.plain.bug
Ben Hutchings
benh at alioth.debian.org
Tue Nov 17 01:18:58 UTC 2009
Author: benh
Date: Tue Nov 17 01:18:56 2009
New Revision: 14642
Log:
Merge /dists/sid/linux-2.6.
This should include all changes up to 2.6.31-2, except patches merged upstream.
Fix up ARM patches to apply to 2.6.32.
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch
- copied unchanged from r14559, dists/sid/linux-2.6/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch
dists/trunk/linux-2.6/debian/patches/features/arm/openrd-client.patch
- copied, changed from r14520, dists/sid/linux-2.6/debian/patches/features/arm/openrd-client.patch
dists/trunk/linux-2.6/debian/patches/features/arm/ts41x.patch
- copied, changed from r14578, dists/sid/linux-2.6/debian/patches/features/arm/ts41x.patch
Modified:
dists/trunk/linux-2.6/ (props changed)
dists/trunk/linux-2.6/debian/bin/abiupdate.py
dists/trunk/linux-2.6/debian/bin/buildcheck.py
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
dists/trunk/linux-2.6/debian/config/i386/defines
dists/trunk/linux-2.6/debian/config/powerpc/config
dists/trunk/linux-2.6/debian/patches/series/base
dists/trunk/linux-2.6/debian/templates/control.source.in
dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-1tainted
dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-network
Modified: dists/trunk/linux-2.6/debian/bin/abiupdate.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/abiupdate.py Mon Nov 16 00:23:27 2009 (r14641)
+++ dists/trunk/linux-2.6/debian/bin/abiupdate.py Tue Nov 17 01:18:56 2009 (r14642)
@@ -76,7 +76,7 @@
f = self.retrieve_package(self.url, filename)
d = self.extract_package(f, "linux-headers-%s_%s" % (prefix, arch))
f1 = d + "/usr/src/linux-headers-%s-%s/Module.symvers" % (self.version_abi, prefix)
- s = Symbols(f1)
+ s = Symbols(open(f1))
shutil.rmtree(d)
return s
@@ -93,11 +93,7 @@
u = url(self.source, filename)
filename_out = self.dir + "/" + filename
- try:
- f_in = urllib2.urlopen(u)
- except urllib2.HTTPError, e:
- raise RuntimeError('Failed to retrieve %s: %s' % (e.filename, e))
-
+ f_in = urllib2.urlopen(u)
f_out = file(filename_out, 'w')
while 1:
r = f_in.read()
@@ -111,7 +107,7 @@
if not os.path.exists(dir):
os.makedirs(dir)
out = "%s/%s_%s_%s" % (dir, arch, featureset, flavour)
- Symbols.write(file(out, 'w'))
+ symbols.write(open(out, 'w'))
def update_arch(self, config, arch):
if self.override_featureset:
@@ -150,8 +146,12 @@
abi = self.get_abi(arch, localversion)
self.save_abi(abi, arch, featureset, flavour)
self.log("Ok.\n")
+ except urllib2.HTTPError, e:
+ self.log("Failed to retrieve %s: %s\n" % (e.filename, e))
except StandardError, e:
- self.log("FAILED! (%s)\n" % str(e))
+ self.log("FAILED!\n")
+ import traceback
+ traceback.print_exc(None, sys.stdout)
if __name__ == '__main__':
options = optparse.OptionParser()
Modified: dists/trunk/linux-2.6/debian/bin/buildcheck.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/buildcheck.py Mon Nov 16 00:23:27 2009 (r14641)
+++ dists/trunk/linux-2.6/debian/bin/buildcheck.py Tue Nov 17 01:18:56 2009 (r14642)
@@ -124,7 +124,6 @@
s_new = new[name]
if s_ref != s_new:
- print "cmp", s_ref.__dict__, s_new.__dict__
change.add(name)
symbols[name] = self.SymbolChangeInfo(s_ref, s_new)
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Mon Nov 16 00:23:27 2009 (r14641)
+++ dists/trunk/linux-2.6/debian/changelog Tue Nov 17 01:18:56 2009 (r14642)
@@ -33,6 +33,45 @@
-- Ben Hutchings <ben at decadent.org.uk> Mon, 26 Oct 2009 01:18:26 +0000
+linux-2.6 (2.6.31-2) unstable; urgency=low
+
+ [ Martin Michlmayr ]
+ * [armel/orion5x, armel/kirkwood] Make sure VGA_CONSOLE is disabled,
+ otherwise the kernel won't boot.
+ * [armel/kirkwood] Enable CRYPTO_DEV_MV_CESA (Closes: #552270).
+ * [armel/kirkwood, armel/orion5x] Enable ORION_WATCHDOG (the
+ name of the config variable changed).
+ * Add OpenRD-Client support again.
+ * Add QNAP TS-41x support.
+ * [armel/orion5x, armel/kirkwood] Enable ISDN (requested by Markus
+ Krebs).
+ * Fix a build failure of the ISDN hisax elsa driver on ARM.
+ * mips: fix build of vmlinux.lds (Closes: #552422).
+
+ [ Ben Hutchings ]
+ * postinst: Accept absolute paths in modules.dep generated by the
+ lenny version of module-init-tools (Closes: #552610)
+ * aufs2: Remove incorrect static assertion (Closes: #554120)
+ * Add stable release 2.6.31.6:
+ - fs: pipe.c null pointer dereference (CVE-2009-3547)
+ - KEYS: get_instantiation_keyring() should inc the keyring refcount
+ in all cases (CVE-2009-3624)
+ - netlink: fix typo in initialization (CVE-2009-3612)
+ * Undo PCMCIA ABI change in 2.6.31.6
+ * Hide wireless keys and wake-on-LAN password when including network
+ configuration in bug reports
+ * Add Geode LX/NX to list of 686-class processors
+
+ [ Bastian Blank ]
+ * [powerpc] Remove SMP warning from PowerMac cpufreq (Closes: #554124)
+
+ [ maximilian Attems ]
+ * Really fix making a debian kernel installable without kernel-img.conf.
+ Thanks for patch to Sebastian Andrzej Siewior <sebastian at breakpoint.cc>.
+ (closes: #555093).
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 15 Nov 2009 18:47:49 +0000
+
linux-2.6 (2.6.31-1) unstable; urgency=low
[ Ben Hutchings ]
Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Mon Nov 16 00:23:27 2009 (r14641)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Tue Nov 17 01:18:56 2009 (r14642)
@@ -59,6 +59,7 @@
CONFIG_MACH_RD88F6281=y
CONFIG_MACH_SHEEVAPLUG=y
CONFIG_MACH_TS219=y
+CONFIG_MACH_TS41X=y
CONFIG_MACH_OPENRD_BASE=y
##
Modified: dists/trunk/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/defines Mon Nov 16 00:23:27 2009 (r14641)
+++ dists/trunk/linux-2.6/debian/config/i386/defines Tue Nov 17 01:18:56 2009 (r14642)
@@ -25,7 +25,7 @@
[686_description]
hardware: modern PCs
-hardware-long: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core or Atom; AMD K6, Athlon (K7), Duron, Opteron, Sempron, Turion or Phenom; Transmeta Efficeon; VIA C3 "Nehemiah" or C7 processors
+hardware-long: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core or Atom; AMD K6, Geode LX/NX, Athlon (K7), Duron, Opteron, Sempron, Turion or Phenom; Transmeta Efficeon; VIA C3 "Nehemiah" or C7 processors
[686_image]
configs:
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config Mon Nov 16 00:23:27 2009 (r14641)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config Tue Nov 17 01:18:56 2009 (r14642)
@@ -641,6 +641,11 @@
CONFIG_TCIC=m
##
+## file: drivers/power/Kconfig
+##
+CONFIG_BATTERY_PMU=m
+
+##
## file: drivers/rtc/Kconfig
##
CONFIG_RTC_DRV_GENERIC=y
Copied: dists/trunk/linux-2.6/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch (from r14559, dists/sid/linux-2.6/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch Tue Nov 17 01:18:56 2009 (r14642, copy of r14559, dists/sid/linux-2.6/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch)
@@ -0,0 +1,15 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: [PATCH] aufs2: Remove incorrect static assertion
+
+This should allow aufs2 to build on alpha.
+
+--- a/fs/aufs/vdir.c
++++ b/fs/aufs/vdir.c
+@@ -25,7 +25,6 @@
+
+ static unsigned int calc_size(int nlen)
+ {
+- BUILD_BUG_ON(sizeof(ino_t) != sizeof(long));
+ return ALIGN(sizeof(struct au_vdir_de) + nlen, sizeof(ino_t));
+ }
+
Copied and modified: dists/trunk/linux-2.6/debian/patches/features/arm/openrd-client.patch (from r14520, dists/sid/linux-2.6/debian/patches/features/arm/openrd-client.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/openrd-client.patch Fri Oct 30 10:37:33 2009 (r14520, copy source)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/openrd-client.patch Tue Nov 17 01:18:56 2009 (r14642)
@@ -132,10 +132,3 @@
+ .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer,
+MACHINE_END
---- a/arch/arm/tools/mach-types~ 2009-10-30 10:33:43.000000000 +0000
-+++ b/arch/arm/tools/mach-types 2009-10-30 10:33:46.000000000 +0000
-@@ -2281,3 +2281,4 @@
- matrix504 MACH_MATRIX504 MATRIX504 2294
- mrfsa MACH_MRFSA MRFSA 2295
- openrd_base MACH_OPENRD_BASE OPENRD_BASE 2325
-+openrd_client MACH_OPENRD_CLIENT OPENRD_CLIENT 2361
Copied and modified: dists/trunk/linux-2.6/debian/patches/features/arm/ts41x.patch (from r14578, dists/sid/linux-2.6/debian/patches/features/arm/ts41x.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/arm/ts41x.patch Thu Nov 5 12:18:15 2009 (r14578, copy source)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/ts41x.patch Tue Nov 17 01:18:56 2009 (r14642)
@@ -285,10 +285,10 @@
+ .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer,
+MACHINE_END
---- a/arch/arm/tools/mach-types~ 2009-11-03 16:52:49.000000000 +0000
-+++ b/arch/arm/tools/mach-types 2009-11-03 16:53:15.000000000 +0000
-@@ -2282,3 +2282,4 @@
- mrfsa MACH_MRFSA MRFSA 2295
- openrd_base MACH_OPENRD_BASE OPENRD_BASE 2325
- openrd_client MACH_OPENRD_CLIENT OPENRD_CLIENT 2361
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
+@@ -2421,3 +2421,4 @@
+ mh355 MACH_MH355 MH355 2435
+ pc7802 MACH_PC7802 PC7802 2436
+ gnet_sgc MACH_GNET_SGC GNET_SGC 2437
+ts41x MACH_TS41X TS41X 2502
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Mon Nov 16 00:23:27 2009 (r14641)
+++ dists/trunk/linux-2.6/debian/patches/series/base Tue Nov 17 01:18:56 2009 (r14642)
@@ -24,6 +24,7 @@
+ features/all/aufs2/aufs2-add.patch
# mark as staging/crap
+ features/all/aufs2/mark-as-staging.patch
++ bugfix/all/aufs2-remove-incorrect-static-assertion.patch
# content of src/ from speakup package; generated with:
# diff -ur --unidirectional-new-file nonexistent src | filterdiff --strip=1 --addoldprefix=a/drivers/staging/speakup/ --addnewprefix=b/drivers/staging/speakup/
@@ -45,3 +46,5 @@
+ debian/dfsg/radeon-add-clarifying-comment-to-r600-blit.patch
+ features/arm/compression-use-generic-gzip.patch
+ features/arm/compression-add-lzmo.patch
++ features/arm/openrd-client.patch
++ features/arm/ts41x.patch
Modified: dists/trunk/linux-2.6/debian/templates/control.source.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.source.in Mon Nov 16 00:23:27 2009 (r14641)
+++ dists/trunk/linux-2.6/debian/templates/control.source.in Tue Nov 17 01:18:56 2009 (r14642)
@@ -1,7 +1,7 @@
Section: kernel
Priority: optional
Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
-Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>, maximilian attems <maks at debian.org>
+Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>, maximilian attems <maks at debian.org>, Ben Hutchings <ben at decadent.org.uk>
Standards-Version: 3.8.3
Build-Depends: debhelper (>> 7), cpio, module-init-tools, python, lzma [armel]
Build-Depends-Indep: bzip2, python-central, xmlto
Modified: dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-1tainted
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-1tainted Mon Nov 16 00:23:27 2009 (r14641)
+++ dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-1tainted Tue Nov 17 01:18:56 2009 (r14642)
@@ -36,8 +36,8 @@
printf "$result_long" >&3
else
echo '** Not tainted' >&3
- echo >&3
fi
+ echo >&3
}
ask_1tainted() {
Modified: dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-network
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-network Mon Nov 16 00:23:27 2009 (r14641)
+++ dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-network Tue Nov 17 01:18:56 2009 (r14642)
@@ -3,7 +3,11 @@
test $REPLY = yep || return 0
echo '** Network interface configuration:' >&3
- cat /etc/network/interfaces >&3
+ # Hide passwords/keys
+ awk '$1 ~ /^wireless-key/ { gsub(".", "*", $2); }
+ $1 == "ethtool-wol" { gsub(".", "*", $3); }
+ { print; }
+ ' </etc/network/interfaces >&3
echo >&3
echo '** Network status:' >&3
if command -v ip >/dev/null; then
More information about the Kernel-svn-changes
mailing list