[kernel] r9254 - in dists/trunk/linux-2.6/debian: . config patches/debian patches/series
Bastian Blank
waldi at alioth.debian.org
Sat Aug 4 11:11:08 UTC 2007
Author: waldi
Date: Sat Aug 4 11:11:08 2007
New Revision: 9254
Log:
* debian/changelog: Set version to 2.6.23~rc2-1~experimental.1.
* debian/config/defines: Disable vserver.
* debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch,
debian/patches/debian/powerpc-mkvmlinuz-support-powerpc.patch,
debian/patches/debian/scripts-kconfig-reportoldconfig.patch: Fix.
* debian/patches/series/1~experimental.1: Disable broken patches.
* debian/patches/series/1~experimental.1-extra: Drop m68k patchset.
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/defines
dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch
dists/trunk/linux-2.6/debian/patches/debian/powerpc-mkvmlinuz-support-powerpc.patch
dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Sat Aug 4 11:11:08 2007
@@ -1,7 +1,4 @@
-linux-2.6 (2.6.22-trunk.1) UNRELEASED; urgency=low
-
- [ Bastian Blank ]
- *
+linux-2.6 (2.6.23~rc2-1~experimental.1) UNRELEASED; urgency=low
[ maximilian attems ]
* [ppc] Enable for powerpc config the ams (Apple Motion Sensor).
@@ -11,13 +8,7 @@
* ipw2200: Enable IPW2200_RADIOTAP and IPW2200_PROMISCUOUS for optional
rtap interface. (closes: #432555)
- -- maximilian attems <maks at debian.org> Sat, 04 Aug 2007 11:20:11 +0200
-
-linux-2.6 (2.6.22-1~experimental.1) UNRELEASED; urgency=low
-
- *
-
- -- Bastian Blank <waldi at debian.org> Tue, 17 Jul 2007 11:42:51 +0200
+ -- Bastian Blank <waldi at debian.org> Sat, 04 Aug 2007 11:46:31 +0200
linux-2.6 (2.6.22-2) UNRELEASED; urgency=low
Modified: dists/trunk/linux-2.6/debian/config/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/defines (original)
+++ dists/trunk/linux-2.6/debian/config/defines Sat Aug 4 11:11:08 2007
@@ -24,7 +24,7 @@
xen-vserver
[featureset-vserver_base]
-enabled: true
+enabled: false
[featureset-xen_base]
enabled: false
Modified: dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch (original)
+++ dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch Sat Aug 4 11:11:08 2007
@@ -2,7 +2,7 @@
index b952c58..5634cc1 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
-@@ -164,44 +164,6 @@ static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev);
+@@ -164,46 +164,6 @@ static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev);
static unsigned int in_module_init = 1;
static const struct pci_device_id piix_pci_tbl[] = {
@@ -43,6 +43,8 @@
- /* ICH7/7-R (i945, i975) UDMA 100*/
- { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_133 },
- { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+- /* ICH8 Mobile PATA Controller */
+- { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
-
/* NOTE: The following PCI ids must be kept in sync with the
* list in drivers/pci/quirks.c.
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 Sat Aug 4 11:11:08 2007
@@ -2,9 +2,9 @@
index 6238b58..edfbed7 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
-@@ -151,13 +151,19 @@ CPPFLAGS_vmlinux.lds := -Upowerpc
+@@ -151,13 +151,19 @@
- BOOT_TARGETS = zImage zImage.initrd zImage.dts zImage.dts_initrd uImage
+ BOOT_TARGETS = zImage zImage.initrd uImage
+BOOT_TARGETS_SPECIAL = mkvmlinuz_support_install
+
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 Sat Aug 4 11:11:08 2007
@@ -24,9 +24,9 @@
+updateoldconfig: $(obj)/conf
+ $< -U arch/$(ARCH)/Kconfig
+
- update-po-config: $(obj)/kxgettext
- xgettext --default-domain=linux \
- --add-comments --keyword=_ --keyword=N_ \
+ # Create new linux.po file
+ # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
+ # The symlink is used to repair a deficiency in arch/um
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 4dcb886..b5e1b25 100644
--- a/scripts/kconfig/conf.c
@@ -196,10 +196,10 @@
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -338,8 +338,6 @@ int conf_read(const char *name)
- /* maybe print value in verbose mode... */
- sym_ok:
- if (sym_has_value(sym) && !sym_is_choice_value(sym)) {
-- if (sym->visible == no)
+ * doesn't quite work if the Kconfig and the saved
+ * configuration disagree.
+ */
+- if (sym->visible == no && !conf_unsaved)
- sym->flags &= ~SYMBOL_DEF_USER;
switch (sym->type) {
case S_STRING:
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 Sat Aug 4 11:11:08 2007
@@ -13,28 +13,28 @@
+ bugfix/powerpc/prep-utah-ide-interrupt.patch
+ bugfix/powerpc/serial.patch
+ bugfix/mips/ide-scan.patch
-+ bugfix/mips/ip22-zilog-console.patch
+#+ bugfix/mips/ip22-zilog-console.patch
+ bugfix/mips/sgi-ioc3.patch
+ bugfix/mips/64bit-tulip.patch
+ bugfix/mips/tulip_dc21143.patch
+ bugfix/mips/cobalt-ide-resources.patch
-+ features/mips/qemu-vga.patch
-+ features/mips/sb1-duart.patch
-+ features/arm/ixp4xx-npe-driver-0.3.1.patch
-+ features/arm/ixp4xx-net-driver-improve-mac-handling.patch
+#+ features/mips/qemu-vga.patch
+#+ features/mips/sb1-duart.patch
+#+ features/arm/ixp4xx-npe-driver-0.3.1.patch
+#+ features/arm/ixp4xx-net-driver-improve-mac-handling.patch
+ features/arm/nslu2-i2c-gpio-driver-support.patch
+ features/arm/nas100d-i2c-gpio-driver-support.patch
+ features/arm/nslu2-mac_plat_info.patch
+ features/arm/nas100d-mac_plat_info.patch
+ features/arm/nslu2-setup-mac.patch
+ features/arm/nas100d-setup-mac.patch
-+ bugfix/drivers-bus_to_virt.patch
+#+ bugfix/drivers-bus_to_virt.patch
+ bugfix/sparc/drivers_net-broken.patch
-+ bugfix/arm/rtc-rs5c372-n2100.patch
+#+ bugfix/arm/rtc-rs5c372-n2100.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
+#+ features/alpha/isa-mapping-support.patch
+ bugfix/powerpc/libgcc-__ucmpdi2.patch
-+ bugfix/arm/disable-broken-config-options-1.patch
+#+ bugfix/arm/disable-broken-config-options-1.patch
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra (original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra Sat Aug 4 11:11:08 2007
@@ -5,47 +5,3 @@
+ features/all/xen/update.patch *_xen *_xen-vserver
+ features/all/xen/vserver-update.patch *_xen-vserver
+ bugfix/arm/nas100d-pata-artop-single-port.patch arm
-
-+ bugfix/m68k/m68k-page.h-needs-compiler.h.diff m68k
-+ bugfix/m68k/630-extern-cleanup.diff.1 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/m68k-use-_AC.diff m68k
-+ bugfix/m68k/m68k-amiga-z2ram-kill-TRUE-FALSE.diff m68k
-+ bugfix/m68k/add-termios2.diff m68k
-+ bugfix/m68k/m68k-arbitary-speed-tty-support.diff m68k
-+ bugfix/m68k/m68k-do-not-include-RODATA-in-text-segment.diff m68k
-+ bugfix/m68k/m68k-53c700-cleanups.diff m68k
-+ bugfix/m68k/split-amiga7xx.diff m68k
-+ bugfix/m68k/m68k-scsi-Kconfig-hickups.diff m68k
-+ bugfix/m68k/zorro_config_attr-read-only.diff m68k
-+ bugfix/m68k/zorro-module-device-table.diff m68k
-+ bugfix/m68k/falconide_intr_lock-ratelimit.diff m68k
-
-+ bugfix/m68k/dmasound_paula.diff m68k
-+ bugfix/m68k/disable-mac-broken-config-options.diff m68k
-
-#+ bugfix/m68k/debian-2.6.21-2-atari-scsi.diff m68k
-+ bugfix/m68k/debian-2.6.21-2-rom-isa.diff m68k
More information about the Kernel-svn-changes
mailing list