[kernel] r17483 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/bugfix/powerpc patches/debian patches/features/all patches/series

[Ben Hutchings]

Author: benh
Date: Mon May 30 19:21:53 2011
New Revision: 17483

Log:
Update to 3.0-rc1

Drop patches merged upstream.
Refresh debian/version.patch and debian/kernelvariables.patch.

Deleted:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/xhci-hcd-Include-linux-slab.h-in-xhci-pci.c.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/powerpc-kexec-Fix-build-failure-on-32-bit-SMP.patch
   dists/trunk/linux-2.6/debian/patches/features/all/rt2800usb-Add-seven-new-USB-IDs.patch
   dists/trunk/linux-2.6/debian/patches/features/all/rt2x00-Add-support-for-the-ZyXEL-NWD-211AN-USB.patch
   dists/trunk/linux-2.6/debian/patches/features/all/rt2x00-Linksys-WUSB600N-rev2-is-a-RT3572-device.patch
   dists/trunk/linux-2.6/debian/patches/series/2
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
   dists/trunk/linux-2.6/debian/patches/debian/version.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 May 30 18:54:31 2011	(r17482)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 30 19:21:53 2011	(r17483)
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.39-2) UNRELEASED; urgency=low
+linux-2.6 (3.0~rc1-1~experimental.1) UNRELEASED; urgency=low
 
   [ Ben Hutchings ]
   * [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA

Modified: dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch	Mon May 30 18:54:31 2011	(r17482)
+++ dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch	Mon May 30 19:21:53 2011	(r17483)
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -192,38 +192,6 @@
+@@ -198,46 +198,6 @@
  CROSS_COMPILE	?=
  CROSS_COMPILE	?= $(CONFIG_CROSS_COMPILE:"%"=%)
  
@@ -29,6 +29,14 @@
 -       SRCARCH := sh
 -endif
 -
+-# Additional ARCH settings for tile
+-ifeq ($(ARCH),tilepro)
+-       SRCARCH := tile
+-endif
+-ifeq ($(ARCH),tilegx)
+-       SRCARCH := tile
+-endif
+-
 -# Where to locate arch specific headers
 -hdr-arch  := $(SRCARCH)
 -
@@ -39,7 +47,7 @@
  KCONFIG_CONFIG	?= .config
  export KCONFIG_CONFIG
  
-@@ -340,6 +311,36 @@ LDFLAGS_MODULE  =
+@@ -354,6 +314,44 @@ LDFLAGS_MODULE  =
  AFLAGS_KERNEL	=
  CFLAGS_GCOV	= -fprofile-arcs -ftest-coverage
  
@@ -67,6 +75,14 @@
 +       SRCARCH := sh
 +endif
 +
++# Additional ARCH settings for tile
++ifeq ($(ARCH),tilepro)
++       SRCARCH := tile
++endif
++ifeq ($(ARCH),tilegx)
++       SRCARCH := tile
++endif
++
 +# Where to locate arch specific headers
 +hdr-arch  := $(SRCARCH)
 +

Modified: dists/trunk/linux-2.6/debian/patches/debian/version.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/version.patch	Mon May 30 18:54:31 2011	(r17482)
+++ dists/trunk/linux-2.6/debian/patches/debian/version.patch	Mon May 30 19:21:53 2011	(r17483)
@@ -37,22 +37,12 @@
  	" (" LINUX_COMPILER ") %s\n";
 --- a/scripts/mkcompile_h
 +++ b/scripts/mkcompile_h
-@@ -64,18 +64,34 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
-   echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
+@@ -73,7 +73,25 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
  
-   echo \#define LINUX_COMPILE_TIME \"`date +%T`\"
--  echo \#define LINUX_COMPILE_BY \"`whoami`\"
--  echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
+   echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
  
--  domain=`dnsdomainname 2> /dev/null`
--  if [ -z "$domain" ]; then
--    domain=`domainname 2> /dev/null`
--  fi
--
--  if [ -n "$domain" ]; then
--    echo \#define LINUX_COMPILE_DOMAIN \"`echo $domain | $UTS_TRUNCATE`\"
--  else
--    echo \#define LINUX_COMPILE_DOMAIN
+-  echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\"
+-  echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\"
 +  DISTRIBUTION=$(lsb_release -is 2>/dev/null)
 +  DISTRIBUTION=${DISTRIBUTION:-Debian}
 +  echo \#define LINUX_COMPILE_DISTRIBUTION \"$DISTRIBUTION\"
@@ -70,16 +60,8 @@
 +      echo \#define LINUX_COMPILE_DISTRIBUTION_VERSION \"unknown\"
 +    fi
 +
-+    echo \#define LINUX_COMPILE_BY \"`whoami`\"
-+    echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
-+
-+    if [ -x /bin/dnsdomainname ]; then
-+      echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname | $UTS_TRUNCATE`\"
-+    elif [ -x /bin/domainname ]; then
-+      echo \#define LINUX_COMPILE_DOMAIN \"`domainname | $UTS_TRUNCATE`\"
-+    else
-+      echo \#define LINUX_COMPILE_DOMAIN
-+    fi
-   fi
++    echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\"
++    echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`
++  fi
  
    echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Mon May 30 18:54:31 2011	(r17482)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Mon May 30 19:21:53 2011	(r17483)
@@ -41,5 +41,5 @@
 
 + debian/sched-autogroup-disabled.patch
 + bugfix/all/rt2800-disable-powersaving-as-default.patch
-+ bugfix/powerpc/powerpc-kexec-Fix-build-failure-on-32-bit-SMP.patch
-+ bugfix/all/xhci-hcd-Include-linux-slab.h-in-xhci-pci.c.patch
++ features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
++ debian/cgroups-Document-the-Debian-memory-resource-controll.patch