* debian/changelog: Fix version.

* debian/patches/bugfix/drivers-bus_to_virt.patch,
  debian/patches/debian/powerpc-mkvmlinuz-support-powerpc.patch,
  debian/patches/debian/version.patch: Fix.
* debian/patches/series/1~experimental.1,
  debian/patches/series/1~experimental.1-extra: Add.
* debian/patches/series/1, debian/patches/series/1-extra: Remove.

svn path=/dists/trunk/linux-2.6/; revision=8613

debian/changelog

@@ -1,8 +1,8 @@
-linux-2.6 (2.6.22~rc2-1) UNRELEASED; urgency=low
+linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low
 
-  * New upstream rc release
+  *
 
- -- maximilian attems <maks@debian.org>  Sun, 20 May 2007 11:05:20 +0200
+ -- Bastian Blank <waldi@debian.org>  Sun, 20 May 2007 08:56:44 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low
 

debian/patches/bugfix/drivers-bus_to_virt.patch

@@ -6,8 +6,8 @@ index 3368745..ed842ad 100644
  
  config ATM_FIRESTREAM
  	tristate "Fujitsu FireStream (FS50/FS155) "
--	depends on PCI && ATM
+-	depends on PCI
-+	depends on PCI && ATM && !PPC64
++	depends on PCI && !PPC64
  	help
  	  Driver for the Fujitsu FireStream 155 (MB86697) and
  	  FireStream 50 (MB86695) ATM PCI chips.
@@ -15,8 +15,8 @@ index 3368745..ed842ad 100644
  
  config ATM_ZATM
  	tristate "ZeitNet ZN1221/ZN1225"
--	depends on PCI && ATM
+-	depends on PCI
-+	depends on PCI && ATM && !PPC64
++	depends on PCI && !PPC64
  	help
  	  Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM
  	  adapters.
@@ -24,8 +24,8 @@ index 3368745..ed842ad 100644
  
  config ATM_AMBASSADOR
  	tristate "Madge Ambassador (Collage PCI 155 Server)"
--	depends on PCI && ATM
+-	depends on PCI
-+	depends on PCI && ATM && !PPC64
++	depends on PCI && !PPC64
  	select BITREVERSE
  	help
  	  This is a driver for ATMizer based ATM card produced by Madge
@@ -33,8 +33,8 @@ index 3368745..ed842ad 100644
  
  config ATM_HORIZON
  	tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)"
--	depends on PCI && ATM
+-	depends on PCI
-+	depends on PCI && ATM && !PPC64
++	depends on PCI && !PPC64
  	help
  	  This is a driver for the Horizon chipset ATM adapter cards once
  	  produced by Madge Networks Ltd. Say Y (or M to compile as a module
@@ -64,19 +64,6 @@ index 6443392..dee6e54 100644
  	---help---
  	  Say Y for support of the configuration interface for the I2O adapters.
  	  If you have a RAID controller from Adaptec and you want to use the
-diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
-index 8aa8dd0..9f65883 100644
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -1469,7 +1469,7 @@ config CS89x0
- 
- config TC35815
- 	tristate "TOSHIBA TC35815 Ethernet support"
--	depends on NET_PCI && PCI && TOSHIBA_JMR3927
-+	depends on NET_PCI && PCI && TOSHIBA_JMR3927 && !PPC64
- 
- config DGRS
- 	tristate "Digi Intl. RightSwitch SE-X support"
 diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
 index 21f76f5..14799d6 100644
 --- a/drivers/net/wan/Kconfig
@@ -85,8 +72,8 @@ index 21f76f5..14799d6 100644
  #
  config LANMEDIA
  	tristate "LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards"
--	depends on WAN && PCI
+-	depends on PCI
-+	depends on WAN && PCI && !PPC64
++	depends on PCI && !PPC64
  	---help---
  	  Driver for the following Lan Media family of serial boards:
  

debian/patches/debian/powerpc-mkvmlinuz-support-powerpc.patch

@@ -24,17 +24,17 @@
  
  CPPFLAGS_vmlinux.lds	:= -Upowerpc
  
--BOOT_TARGETS = zImage zImage.initrd uImage
+-BOOT_TARGETS = zImage zImage.initrd zImage.dts zImage.dts_initrd uImage
-+BOOT_TARGETS = zImage zImage.initrd uImage mkvmlinuz_support_install
++BOOT_TARGETS = zImage zImage.initrd zImage.dts zImage.dts_initrd uImage mkvmlinuz_support_install
  
  PHONY += $(BOOT_TARGETS)
  
 --- linux-2.6.20-rc3/arch/powerpc/boot/Makefile.orig	2007-01-04 16:22:53.000000000 +0100
 +++ linux-2.6.20-rc3/arch/powerpc/boot/Makefile	2007-01-04 16:23:40.000000000 +0100
 @@ -186,3 +186,19 @@
- clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip.gz)
+ clean-kernel += $(addsuffix .gz,$(clean-kernel))
- clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.bin.gz)
+ # If not absolute clean-files are relative to $(obj).
- clean-files += $(image-)
+ clean-files += $(addprefix $(objtree)/, $(clean-kernel))
 +
 +#-----------------------------------------------------------
 +# install mkvmlinuz support files

debian/patches/debian/version.patch

@@ -44,7 +44,7 @@ index 82d0af4..d8e0d05 100755
 @@ -47,15 +47,35 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
    echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
  
-   echo \#define LINUX_COMPILE_TIME \"`LC_ALL=C LANG=C date +%T`\"
+   echo \#define LINUX_COMPILE_TIME \"`date +%T`\"
 -  echo \#define LINUX_COMPILE_BY \"`whoami`\"
 -  echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
  

debian/patches/series/1~experimental.1

@@ -1,9 +1,9 @@
-#+ debian/version.patch
++ debian/version.patch
 + debian/kernelvariables.patch
 + debian/doc-build-parallel.patch
 + debian/scripts-kconfig-reportoldconfig.patch
 + debian/powerpc-mkvmlinuz-support-ppc.patch
-#+ debian/powerpc-mkvmlinuz-support-powerpc.patch
++ debian/powerpc-mkvmlinuz-support-powerpc.patch
 
 + debian/drivers-ata-ata_piix-postpone-pata.patch
 
@@ -26,11 +26,11 @@
 + features/arm/nas100d-eth-mac.patch
 #+ features/arm/ixp4xx_npe_driver-0.3.1.patch
 #+ features/arm/ixp4xx-net-driver-improve-mac-handling.patch
-#+ bugfix/drivers-bus_to_virt.patch
++ bugfix/drivers-bus_to_virt.patch
 + bugfix/sparc/drivers_net-broken.patch
 #+ bugfix/arm/disable-broken-config-options.patch
 #+ bugfix/arm/disable-broken-config-options2.patch
-+ bugfix/arm/disable-broken-config-options3.patch
+#+ bugfix/arm/disable-broken-config-options3.patch
 + bugfix/arm/rtc-rs5c372-n2100.patch
 #+ features/alpha/alpha-prctl.patch
 + bugfix/forcedeth-napi-broken.patch

debian/patches/series/1~experimental.1-extra

@@ -6,40 +6,8 @@
 + features/all/xen/vserver-update.patch *_xen-vserver
 + bugfix/arm/nas100d-artop-temp-fix.patch arm
 
-# Integrated in 2.6.22-rc1
-#+ bugfix/m68k/634-atari_scsi.diff m68k
-#+ bugfix/m68k/atari-scsi-reformat.diff m68k
-#+ bugfix/m68k/atari-scsi-compile-fixes.diff m68k
-#+ bugfix/m68k/635-atari_input.diff m68k
-#+ bugfix/m68k/636-atafb.diff m68k
-#+ bugfix/m68k/m68k-linux-gnu-crosscompile.diff m68k
-#+ bugfix/m68k/357-mac89x0.diff m68k
-#+ bugfix/m68k/irq_lockdep.diff m68k
-#+ bugfix/m68k/m68k-reformat.diff m68k
-#+ bugfix/m68k/hilkbd-warning.diff m68k
-#+ bugfix/m68k/early-param.diff m68k
-#+ bugfix/m68k/sun3-numints.diff m68k
-#+ bugfix/m68k/atari_NCR5380-work.diff m68k
-#+ bugfix/m68k/pmu_queue_request-conflict.diff m68k
-#+ bugfix/m68k/amiga-a2065-ariadne-stats.diff m68k
-#+ bugfix/m68k/mac68k-remove-unused-adb-header.diff m68k
-#+ bugfix/m68k/mac68k-patch_d-via-alt-mapping.diff m68k
-#+ bugfix/m68k/mac68k-patch_A-mac68k_cvs_nubus_defines.diff m68k
-#+ bugfix/m68k/mac68k-patch_B-mac68k_cvs_DP8390_update.diff m68k
-#+ bugfix/m68k/mac68k-revert-remaining-irq-damage.diff m68k
-#+ bugfix/m68k/mac68k-irq-prep.diff m68k
-#+ bugfix/m68k/mac68k-irq-plan-e.diff m68k
-#+ bugfix/m68k/mac68k-finish_irq_cleanup.diff m68k
-#+ bugfix/m68k/mac68k-macii-adb-fixes.diff m68k
-#+ bugfix/m68k/mac68k-cuda-adb-fixes.diff m68k
-#+ bugfix/m68k/mac68k-macmace-fixes.diff m68k
-#+ bugfix/m68k/mac68k-sonic-fixes.diff m68k
-#+ bugfix/m68k/mac68k-macsonic-via-alt-mapping.diff m68k
-#+ bugfix/m68k/zorro-resource_size_t-warnings.diff m68k
-#+ bugfix/m68k/kmap_atomic-inline.diff m68k
 # Submitted
 + bugfix/m68k/falconide_intr_lock-reentrant.diff m68k
-#+ bugfix/m68k/577-module-arch.diff m68k
 #+ bugfix/m68k/600-task_thread_info.diff m68k
 + bugfix/m68k/611-module_fixup.diff m68k
 + bugfix/m68k/618-discontig.diff m68k
@@ -71,4 +39,3 @@
 
 + bugfix/m68k/dmasound_paula.diff m68k
 + bugfix/m68k/disable-mac-broken-config-options.diff m68k
-+ bugfix/m68k/633-atari_scc.diff m68k