[kernel] r13217 - in dists/trunk/linux-2.6/debian: . patches/debian patches/series

[Maximilian Attems]

Author: maks
Date: Tue Mar 24 00:40:04 2009
New Revision: 13217

Log:
update to 2.6.29

fixed trivial conflict in scripts-kconfig-reportoldconfig.patch
bnx2 firmware patch needs little work
several arm patches disabled as they no longer apply

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Mar 24 00:40:04 2009
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.29~rc8-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.29-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release
     - tg3 use request_firmware and firmware nuked.

Modified: dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch	Tue Mar 24 00:40:04 2009
@@ -39,7 +39,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -433,12 +434,13 @@ int main(int ac, char **av)
+@@ -434,12 +435,13 @@ int main(int ac, char **av)
  	int opt;
  	const char *name;
  	struct stat tmpstat;
@@ -54,10 +54,10 @@
  		switch (opt) {
  		case 'o':
  			input_mode = ask_silent;
-@@ -467,6 +469,14 @@ int main(int ac, char **av)
+@@ -481,6 +482,14 @@ int main(int ac, char **av)
  			input_mode = set_random;
- 			srand(time(NULL));
  			break;
+ 		}
 +		case 'R':
 +			input_mode = set_default;
 +			report = update = true;
@@ -69,7 +69,7 @@
  		case 'h':
  			printf(_("See README for usage info\n"));
  			exit(0);
-@@ -498,13 +508,17 @@ int main(int ac, char **av)
+@@ -512,13 +522,17 @@ int main(int ac, char **av)
  
  	switch (input_mode) {
  	case set_default:
@@ -94,7 +94,7 @@
  		}
  		break;
  	case ask_silent:
-@@ -580,6 +594,9 @@ int main(int ac, char **av)
+@@ -594,6 +608,9 @@ int main(int ac, char **av)
  		break;
  	}
  

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Tue Mar 24 00:40:04 2009
@@ -6,7 +6,7 @@
 + debian/drivers-ata-ata_piix-postpone-pata.patch
 + debian/drivers-ata-pata_sis-postpone-pata.patch
 
-+ debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
+#+ debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
 + features/all/drivers-gpu-drm-mga-request_firmware.patch
 + features/all/drivers-gpu-drm-r128-request_firmware.patch
 + features/all/drivers-gpu-drm-radeon-request_firmware.patch
@@ -32,10 +32,10 @@
 + features/arm/mv-sdio.patch
 + features/arm/kw-register-sdio.patch
 + features/arm/kw-register-internal-devices.patch
-+ features/arm/kw-sheevaplug.patch
-+ features/arm/kw-sheevaplug-usb-power.patch
-+ features/arm/kw-sheevaplug-led.patch
+#+ features/arm/kw-sheevaplug.patch
+#+ features/arm/kw-sheevaplug-usb-power.patch
+#+ features/arm/kw-sheevaplug-led.patch
 + features/arm/kw-hook-up-i2c.patch
-+ features/arm/kw-dont-init-rtc.patch
+#+ features/arm/kw-dont-init-rtc.patch
 + features/arm/kw-consistency-mpp.patch
-+ features/arm/ts219.patch
+#+ features/arm/ts219.patch