[kernel] r18901 - dists/sid/linux-2.6/debian/patches/debian

[Ben Hutchings]

Author: benh
Date: Tue Apr  3 04:34:17 2012
New Revision: 18901

Log:
Adding header information for most Debian-specific patches

Modified:
   dists/sid/linux-2.6/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch
   dists/sid/linux-2.6/debian/patches/debian/doc-build-parallel.patch
   dists/sid/linux-2.6/debian/patches/debian/kernelvariables.patch
   dists/sid/linux-2.6/debian/patches/debian/sched-autogroup-disabled.patch
   dists/sid/linux-2.6/debian/patches/debian/sysrq-mask.patch
   dists/sid/linux-2.6/debian/patches/debian/version.patch

Modified: dists/sid/linux-2.6/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch	Tue Apr  3 03:11:24 2012	(r18900)
+++ dists/sid/linux-2.6/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch	Tue Apr  3 04:34:17 2012	(r18901)
@@ -2,6 +2,10 @@
 Date: Thu, 24 Nov 2011 07:45:52 +0000
 Subject: [PATCH] bcma: Do not claim PCI device IDs also claimed by brcmsmac
 
+brcmsmac was not updated to use the bcma bus driver until Linux 3.3.
+For 3.2 we want bcma to claim only the devices that brcmsmac doesn't
+support.
+
 Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
 ---
  drivers/bcma/host_pci.c                |    4 +++-

Modified: dists/sid/linux-2.6/debian/patches/debian/doc-build-parallel.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/doc-build-parallel.patch	Tue Apr  3 03:11:24 2012	(r18900)
+++ dists/sid/linux-2.6/debian/patches/debian/doc-build-parallel.patch	Tue Apr  3 04:34:17 2012	(r18901)
@@ -1,3 +1,14 @@
+From: Bastian Blank <waldi at debian.org>
+Subject: DocBook: Make Documentation/DocBook -j clean
+Date: Tue, 14 Jun 2006 00:05:06 +0200
+
+Two concurrent calls to cmd_db2man may attempt to compress manual
+pages generated by each other.  gzip can then fail due to an input
+file having already been compressed and removed.
+
+Since dh_compress will compress manual pages later, we don't need
+to run gzip here at all.
+
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
 index 5a2882d..71c7077 100644
 --- a/Documentation/DocBook/Makefile

Modified: dists/sid/linux-2.6/debian/patches/debian/kernelvariables.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/kernelvariables.patch	Tue Apr  3 03:11:24 2012	(r18900)
+++ dists/sid/linux-2.6/debian/patches/debian/kernelvariables.patch	Tue Apr  3 04:34:17 2012	(r18901)
@@ -1,3 +1,16 @@
+From: Bastian Blank <waldi at debian.org>
+Subject: kbuild: Make the toolchain variables easily overwritable
+Date: Sun, 22 Feb 2009 15:39:35 +0100
+
+Allow make variables to be overridden for each flavour by a file in
+the build tree, .kernelvariables.
+
+We currently use this for ARCH, KERNELRELEASE, CC, and in some cases
+also CROSS_COMPILE, CFLAGS_KERNEL and CFLAGS_MODULE.
+
+This file can only be read after we establish the build tree, and all
+use of $(ARCH) needs to be moved after this.
+
 --- a/Makefile
 +++ b/Makefile
 @@ -198,46 +198,6 @@

Modified: dists/sid/linux-2.6/debian/patches/debian/sched-autogroup-disabled.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/sched-autogroup-disabled.patch	Tue Apr  3 03:11:24 2012	(r18900)
+++ dists/sid/linux-2.6/debian/patches/debian/sched-autogroup-disabled.patch	Tue Apr  3 04:34:17 2012	(r18901)
@@ -1,3 +1,10 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: sched: Do not enable autogrouping by default
+Date: Wed, 16 Mar 2011 03:17:06 +0000
+
+We want to provide the option of autogrouping but without enabling
+it by default yet.
+
 diff --git a/kernel/sched_autogroup.c b/kernel/sched_autogroup.c
 index 9fb6562..96abaaf 100644
 --- a/kernel/sched_autogroup.c

Modified: dists/sid/linux-2.6/debian/patches/debian/sysrq-mask.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/sysrq-mask.patch	Tue Apr  3 03:11:24 2012	(r18900)
+++ dists/sid/linux-2.6/debian/patches/debian/sysrq-mask.patch	Tue Apr  3 04:34:17 2012	(r18901)
@@ -1,3 +1,10 @@
+From: Bastian Blank <waldi at debian.org>
+Subject: Allow access to sensitive SysRq keys to be restricted by default
+Date: Sun, 14 Feb 2010 16:11:35 +0100
+
+Add a Kconfig variable to set the initial value of the Magic
+SysRq mask (sysctl: kernel.sysrq).
+
 --- a/include/linux/sysrq.h
 +++ b/include/linux/sysrq.h
 @@ -18,7 +18,7 @@

Modified: dists/sid/linux-2.6/debian/patches/debian/version.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/version.patch	Tue Apr  3 03:11:24 2012	(r18900)
+++ dists/sid/linux-2.6/debian/patches/debian/version.patch	Tue Apr  3 04:34:17 2012	(r18901)
@@ -1,3 +1,25 @@
+From: Bastian Blank <waldi at debian.org>
+Subject: Add debian version information to kernel version string
+Date: Sun, 20 May 2007 11:46:51 +0200
+
+Include the package version in /proc/version and the initial log
+banner.
+
+Determine the target distribution ($DISTRIBUTION) with lsb_release,
+defaulting to Debian.
+
+For distribution binary packages we assume
+$DISTRIBUTION_OFFICIAL_BUILD is set.  Add $DISTRIBUTION and
+$DISTRIBUTION_VERSION after the kernel version (UTS_RELEASE), and
+replace the account name used to build the package with
+$DISTRIBUTION_UPLOADER.
+
+[bwh: Changed $DISTRIBUTION_UPLOADER to $DISTRIBUTION_MAINTAINER.]
+
+For custom packages built from a linux-source package, read the
+package version from version.$DISTRIBUTION and add that after
+the kernel version string.
+
 --- a/init/version.c
 +++ b/init/version.c
 @@ -36,12 +36,31 @@ struct uts_namespace init_uts_ns = {