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

Bastian Blank waldi at alioth.debian.org
Sun May 20 09:46:51 UTC 2007 

Author: waldi
Date: Sun May 20 09:46:51 2007
New Revision: 8613

Log:
* 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.


Added:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
Removed:
   dists/trunk/linux-2.6/debian/patches/series/1
   dists/trunk/linux-2.6/debian/patches/series/1-extra
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch
   dists/trunk/linux-2.6/debian/patches/debian/powerpc-mkvmlinuz-support-powerpc.patch
   dists/trunk/linux-2.6/debian/patches/debian/version.patch

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun May 20 09:46:51 2007
@@ -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 at debian.org>  Sun, 20 May 2007 11:05:20 +0200
+ -- Bastian Blank <waldi at debian.org>  Sun, 20 May 2007 08:56:44 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch	Sun May 20 09:46:51 2007
@@ -6,8 +6,8 @@
  
  config ATM_FIRESTREAM
  	tristate "Fujitsu FireStream (FS50/FS155) "
--	depends on PCI && ATM
-+	depends on PCI && ATM && !PPC64
+-	depends on PCI
++	depends on PCI && !PPC64
  	help
  	  Driver for the Fujitsu FireStream 155 (MB86697) and
  	  FireStream 50 (MB86695) ATM PCI chips.
@@ -15,8 +15,8 @@
  
  config ATM_ZATM
  	tristate "ZeitNet ZN1221/ZN1225"
--	depends on PCI && ATM
-+	depends on PCI && ATM && !PPC64
+-	depends on PCI
++	depends on PCI && !PPC64
  	help
  	  Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM
  	  adapters.
@@ -24,8 +24,8 @@
  
  config ATM_AMBASSADOR
  	tristate "Madge Ambassador (Collage PCI 155 Server)"
--	depends on PCI && ATM
-+	depends on PCI && ATM && !PPC64
+-	depends on PCI
++	depends on PCI && !PPC64
  	select BITREVERSE
  	help
  	  This is a driver for ATMizer based ATM card produced by Madge
@@ -33,8 +33,8 @@
  
  config ATM_HORIZON
  	tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)"
--	depends on PCI && ATM
-+	depends on PCI && ATM && !PPC64
+-	depends on PCI
++	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 @@
  	---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 @@
  #
  config LANMEDIA
  	tristate "LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards"
--	depends on WAN && PCI
-+	depends on WAN && PCI && !PPC64
+-	depends on PCI
++	depends on PCI && !PPC64
  	---help---
  	  Driver for the following Lan Media family of serial boards:
  

Modified: dists/trunk/linux-2.6/debian/patches/debian/powerpc-mkvmlinuz-support-powerpc.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/powerpc-mkvmlinuz-support-powerpc.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/powerpc-mkvmlinuz-support-powerpc.patch	Sun May 20 09:46:51 2007
@@ -24,17 +24,17 @@
  
  CPPFLAGS_vmlinux.lds	:= -Upowerpc
  
--BOOT_TARGETS = zImage zImage.initrd uImage
-+BOOT_TARGETS = zImage zImage.initrd uImage mkvmlinuz_support_install
+-BOOT_TARGETS = zImage zImage.initrd zImage.dts zImage.dts_initrd uImage
++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-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.bin.gz)
- clean-files += $(image-)
+ clean-kernel += $(addsuffix .gz,$(clean-kernel))
+ # If not absolute clean-files are relative to $(obj).
+ clean-files += $(addprefix $(objtree)/, $(clean-kernel))
 +
 +#-----------------------------------------------------------
 +# install mkvmlinuz support files

Modified: dists/trunk/linux-2.6/debian/patches/debian/version.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/version.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/version.patch	Sun May 20 09:46:51 2007
@@ -44,7 +44,7 @@
 @@ -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`\"
  

Added: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Sun May 20 09:46:51 2007
@@ -0,0 +1,40 @@
++ 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/drivers-ata-ata_piix-postpone-pata.patch
+
++ bugfix/powerpc/build-links.patch
++ bugfix/powerpc/mv643xx-hotplug-support.patch
++ bugfix/powerpc/oldworld-boot-fix.patch
++ bugfix/powerpc/prep-utah-ide-interrupt.patch
++ bugfix/powerpc/serial.patch
+#+ bugfix/mips/eth-napi.patch
++ bugfix/mips/ide-scan.patch
++ bugfix/mips/ip22-zilog-console.patch
++ bugfix/mips/sgi-ioc3.patch
+#+ bugfix/mips/64bit-tulip.patch
++ bugfix/mips/tulip_dc21143.patch
++ features/mips/qemu-vga.patch
++ features/mips/sb1-duart.patch
++ features/arm/nslu2-setup-mac.patch
++ features/arm/nslu2-eth-mac.patch
++ features/arm/nas100d-setup-mac.patch
++ 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/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/rtc-rs5c372-n2100.patch
+#+ features/alpha/alpha-prctl.patch
++ bugfix/forcedeth-napi-broken.patch
+#+ bugfix/powerpc/drivers_macintosh-broken.patch
++ bugfix/ia64/hardcode-arch-script-output.patch
++ features/fintek-f75375.patch
++ features/alpha/isa-mapping-support.patch

Added: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	Sun May 20 09:46:51 2007
@@ -0,0 +1,41 @@
++ features/all/vserver/vs2.2.0-rc1.patch *_vserver *_xen-vserver
++ features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver
++ features/all/xen/vserver-clash.patch *_xen-vserver
++ features/all/xen/fedora-2.6.20-48670.patch *_xen *_xen-vserver
++ features/all/xen/update.patch *_xen *_xen-vserver
++ features/all/xen/vserver-update.patch *_xen-vserver
++ bugfix/arm/nas100d-artop-temp-fix.patch arm
+
+# Submitted
++ bugfix/m68k/falconide_intr_lock-reentrant.diff m68k
+#+ bugfix/m68k/600-task_thread_info.diff m68k
++ bugfix/m68k/611-module_fixup.diff m68k
++ bugfix/m68k/618-discontig.diff m68k
++ bugfix/m68k/630-extern-cleanup.diff m68k
+#+ bugfix/m68k/633-atari_scc.diff m68k
++ bugfix/m68k/130-adbraw.diff m68k
+#+ bugfix/m68k/133-arch.diff m68k
+#+ bugfix/m68k/134-atari-fat.diff m68k
++ bugfix/m68k/141-ide.diff m68k
++ bugfix/m68k/143-ioext.diff m68k
++ bugfix/m68k/149-mc68681.diff m68k
++ bugfix/m68k/152-pci.diff m68k
++ bugfix/m68k/448-ide.diff m68k
++ bugfix/m68k/478-serial.diff m68k
+#+ bugfix/m68k/631-thread_stack.diff m68k
++ bugfix/m68k/atari-rom-isa.diff m68k
++ bugfix/m68k/atari-ethernec.diff m68k
++ bugfix/m68k/unnecessary-m68k_memoffset.diff m68k
++ bugfix/m68k/atari-aranym.diff m68k
++ bugfix/m68k/ethernec-work.diff m68k
++ bugfix/m68k/nfeth-virt_to_phys.diff m68k
++ bugfix/m68k/ethernec-kill-ETHERNEC_USE_POLL.diff m68k
+#+ bugfix/m68k/sun3-3x-cg3-bw2.diff m68k
+#+ bugfix/m68k/sun3-3x-serial.diff m68k
++ bugfix/m68k/m68k-generic-io.diff m68k
++ bugfix/m68k/m68k-mvme-scsi-rename.diff m68k
++ bugfix/m68k/m68k-53c700-scsi.diff m68k
++ bugfix/m68k/via-pmu68k-dead-code.diff m68k
+
++ bugfix/m68k/dmasound_paula.diff m68k
++ bugfix/m68k/disable-mac-broken-config-options.diff m68k

More information about the Kernel-svn-changes mailing list