[kernel] r9529 - in dists/trunk/linux-2.6: . debian debian/bin debian/config/alpha debian/config/ia64 debian/config/mipsel debian/config/sparc debian/templates debian/templates/image.plain.bug
Bastian Blank
waldi at alioth.debian.org
Sun Sep 16 10:29:09 UTC 2007
Author: waldi
Date: Sun Sep 16 10:29:09 2007
New Revision: 9529
Log:
Merge /dists/sid/linux-2.6.
Modified:
dists/trunk/linux-2.6/ (props changed)
dists/trunk/linux-2.6/debian/bin/abiupdate.py
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/alpha/config
dists/trunk/linux-2.6/debian/config/ia64/config
dists/trunk/linux-2.6/debian/config/ia64/defines
dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
dists/trunk/linux-2.6/debian/config/sparc/config
dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in
dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-1tainted
Modified: dists/trunk/linux-2.6/debian/bin/abiupdate.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/abiupdate.py (original)
+++ dists/trunk/linux-2.6/debian/bin/abiupdate.py Sun Sep 16 10:29:09 2007
@@ -47,7 +47,7 @@
self.version = changelog.version.linux_version
self.version_source = changelog.version.complete
- local_config = config_reader_arch(["debian/config"])
+ local_config = ConfigReaderCore(["debian/config"])
self.abiname = local_config['abi',]['abiname']
self.version_abi = self.version + '-' + self.abiname
@@ -89,8 +89,8 @@
filename = "linux-support-%s_%s_all.deb" % (self.version_abi, self.version_source)
f = self.retrieve_package(self.url_config, filename)
d = self.extract_package(f, "linux-support")
- dir = d + "/usr/src/linux-support-" + self.version_abi + "/arch"
- config = config_reader_arch([dir])
+ dir = d + "/usr/src/linux-support-" + self.version_abi + "/config"
+ config = ConfigReaderCore([dir])
shutil.rmtree(d)
return config
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Sun Sep 16 10:29:09 2007
@@ -65,7 +65,210 @@
-- Bastian Blank <waldi at debian.org> Sat, 15 Sep 2007 21:25:41 +0200
-linux-2.6 (2.6.22-2) UNRELEASED; urgency=low
+linux-2.6 (2.6.22-5) UNRELEASED; urgency=low
+
+ [ maximilian attems ]
+ * Add stable release 2.6.22.6 (minus 2 abi breaker):
+ - USB: allow retry on descriptor fetch errors
+ - PCI: lets kill the 'PCI hidden behind bridge' message
+ - Netfilter: Missing Kbuild entry for netfilter
+ - Fix soft-fp underflow handling.
+ - SPARC64: Fix sparc64 task stack traces.
+ - DCCP: Fix DCCP GFP_KERNEL allocation in atomic context
+ - SNAP: Fix SNAP protocol header accesses.
+ - NET: Fix missing rcu unlock in __sock_create()
+ - IPv6: Invalid semicolon after if statement
+ - TCP: Fix TCP rate-halving on bidirectional flows.
+ - TCP: Fix TCP handling of SACK in bidirectional flows.
+ - uml: fix previous request size limit fix
+ - usb: add PRODUCT, TYPE to usb-interface events
+ - PPP: Fix PPP buffer sizing.
+ - ocfs2: Fix bad source start calculation during kernel writes
+ - signalfd: fix interaction with posix-timers
+ - signalfd: make it group-wide, fix posix-timers scheduling
+ - USB: fix DoS in pwc USB video driver
+ - sky2: don't clear phy power bits
+ - PCI: disable MSI on RS690
+ - PCI: disable MSI on RD580
+ - PCI: disable MSI on RX790
+ - IPV6: Fix kernel panic while send SCTP data with IP fragments
+ - i386: fix lazy mode vmalloc synchronization for paravirt
+
+ [ Martin Michlmayr ]
+ * [mips] Add a fix so qemu NE2000 will work again.
+ * [mipsel/r5k-cobalt] Enable MTD.
+
+ [ Steve Langasek ]
+ * Set CONFIG_MATHEMU=y on alpha, which is required for proper fp math on
+ at least ev4-ev56 systems. Closes: #411813.
+ * linux-image packages need to depend on a newer version of coreutils,
+ because of the use of readlink -q -m inherited from kernel-package.
+ Closes: #413311.
+
+ [ Bastian Blank ]
+ * Fix tainted check in bug scripts.
+
+ -- Bastian Blank <waldi at debian.org> Sun, 09 Sep 2007 15:13:20 +0200
+
+linux-2.6 (2.6.22-4) unstable; urgency=low
+
+ [ dann frazier ]
+ * [hppa] Use generic compat_sys_getdents (closes: #431773)
+
+ [ Martin Michlmayr ]
+ * [powerpc] Fix PS/2 keyboard detection on Pegasos (closes: #435378).
+
+ [ Emanuele Rocca ]
+ * [sparc] Add patch to fix PCI config space accesses on sun4u.
+ * [sparc] Disable CONFIG_SCSI_SCAN_ASYNC.
+
+ [ maximilian attems ]
+ * Add stable release 2.6.22.2:
+ - usb-serial: Fix edgeport regression on non-EPiC devices
+ - Missing header include in ipt_iprange.h
+ - drivers/video/macmodes.c:mac_find_mode() mustn't be __devinit
+ - Fix ipv6 tunnel endianness bug.
+ - aacraid: fix security hole
+ - USB: cdc-acm: fix sysfs attribute registration bug
+ - USB: fix warning caused by autosuspend counter going negative
+ - Fix sparc32 memset()
+ - Fix leak on /proc/lockdep_stats
+ - Fix leaks on /proc/{*/sched, sched_debug, timer_list, timer_stats}
+ - futex: pass nr_wake2 to futex_wake_op
+ - md: handle writes to broken raid10 arrays gracefully
+ - forcedeth bug fix: cicada phy
+ - forcedeth bug fix: vitesse phy
+ - forcedeth bug fix: realtek phy
+ - ACPI: dock: fix opps after dock driver fails to initialize
+ - pcmcia: give socket time to power down
+ - drm/i915: Fix i965 secured batchbuffer usage (CVE-2007-3851)
+ - Fix console write locking in sparc drivers.
+ - Sparc64 bootup assembler bug
+ - IPV6: /proc/net/anycast6 unbalanced inet6_dev refcnt
+ - make timerfd return a u64 and fix the __put_user
+ - Fix error queue socket lookup in ipv6
+ - Input: lifebook - fix an oops on Panasonic CF-18
+ - readahead: MIN_RA_PAGES/MAX_RA_PAGES macros
+ - V4L: Add check for valid control ID to v4l2_ctrl_next
+ - V4L: ivtv: fix broken VBI output support
+ - V4L: ivtv: fix DMA timeout when capturing VBI + another stream
+ - V4L: ivtv: Add locking to ensure stream setup is atomic
+ - V4L: wm8775/wm8739: Fix memory leak when unloading module
+ - do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY
+ - Include serial_reg.h with userspace headers (closes: #433755)
+ - TCP FRTO retransmit bug fix
+ - Fix rfkill IRQ flags.
+ - nfsd: fix possible read-ahead cache and export table corruption
+ - nfsd: fix possible oops on re-insertion of rpcsec_gss modules
+ - jbd commit: fix transaction dropping
+ - jbd2 commit: fix transaction dropping
+ - softmac: Fix ESSID problem
+ - uml: limit request size on COWed devices
+ - UML: exports for hostfs
+ - splice: fix double page unlock
+ - cfq-iosched: fix async queue behaviour
+ - cr_backlight_probe() allocates too little storage for struct cr_panel
+ - sx: switch subven and subid values
+ - hugetlb: fix race in alloc_fresh_huge_page()
+ - KVM: SVM: Reliably detect if SVM was disabled by BIOS
+ - dm io: fix another panic on large request
+ - md: raid10: fix use-after-free of bio
+ - fs: 9p/conv.c error path fix
+ - Fix sparc32 udelay() rounding errors.
+ - sony-laptop: fix bug in event handling
+ - eCryptfs: ecryptfs_setattr() bugfix
+ - Hangup TTY before releasing rfcomm_dev
+ - dm io: fix panic on large request
+ - dm raid1: fix status
+ - dm snapshot: permit invalid activation
+ - "ext4_ext_put_in_cache" uses __u32 to receive physical block number
+ - destroy_workqueue() can livelock
+ - USB: fix for ftdi_sio quirk handling
+ - Fix TC deadlock.
+ - Fix IPCOMP crashes.
+ - gen estimator timer unload race
+ - Netfilter: Fix logging regression
+ - Fix user struct leakage with locked IPC shem segment
+ - Fix reported task file values in sense data
+ - gen estimator deadlock fix
+ - Netpoll leak
+ - dm: disable barriers
+ - firewire: fw-sbp2: set correct maximum payload (fixes CardBus adapters)
+ - fw-ohci: fix "scheduling while atomic"
+ - firewire: fix memory leak of fw_request instances
+ - ieee1394: revert "sbp2: enforce 32bit DMA mapping"
+ - libata: add FUJITSU MHV2080BH to NCQ blacklist
+ - i386: HPET, check if the counter works
+ - CPU online file permission
+ - acpi-cpufreq: Proper ReadModifyWrite of PERF_CTL MSR
+ - Keep rfcomm_dev on the list until it is freed
+ - SCTP scope_id handling fix
+ - Fix ipv6 link down handling.
+ - Fix TCP IPV6 MD5 bug.
+ - sysfs: release mutex when kmalloc() failed in sysfs_open_file().
+ - nf_conntrack: don't track locally generated special ICMP error
+ * Bump abi due to firewire, ivtv and xrfm changes.
+ * Add stable release 2.6.22.3:
+ - fix oops in __audit_signal_info()
+ - direct-io: fix error-path crashes
+ - powerpc: Fix size check for hugetlbfs
+ - stifb: detect cards in double buffer mode more reliably
+ - pata_atiixp: add SB700 PCI ID
+ - PPC: Revert "[POWERPC] Add 'mdio' to bus scan id list for platforms
+ with QE UEC"
+ - random: fix bound check ordering (CVE-2007-3105)
+ - softmac: Fix deadlock of wx_set_essid with assoc work
+ - PPC: Revert "[POWERPC] Don't complain if size-cells == 0 in prom_parse()"
+ - ata_piix: update map 10b for ich8m
+ - CPUFREQ: ondemand: fix tickless accounting and software coordination bug
+ - CPUFREQ: ondemand: add a check to avoid negative load calculation
+ * Add stable release 2.6.22.4:
+ - Reset current->pdeath_signal on SUID binary execution (CVE-2007-3848)
+ * Add stable release 2.6.22.5:
+ - x86_64: Check for .cfi_rel_offset in CFI probe
+ - x86_64: Change PMDS invocation to single macro
+ - i386: Handle P6s without performance counters in nmi watchdog
+ - revert "x86, serial: convert legacy COM ports to platform devices"
+ - ACPICA: Fixed possible corruption of global GPE list
+ - ACPICA: Clear reserved fields for incoming ACPI 1.0 FADTs
+ - i386: Fix double fault handler
+ - JFFS2 locking regression fix.
+ - r8169: avoid needless NAPI poll scheduling
+ - Linux 2.6.22.5
+ - AVR32: Fix atomic_add_unless() and atomic_sub_unless()
+ - i386: allow debuggers to access the vsyscall page with compat vDSO
+ - hwmon: (smsc47m1) restore missing name attribute
+ - hwmon: fix w83781d temp sensor type setting
+ - Hibernation: do not try to mark invalid PFNs as nosave
+ - sky2: restore workarounds for lost interrupts
+ - sky2: carrier management
+ - sky2: check for more work before leaving NAPI
+ - sky2: check drop truncated packets
+ - forcedeth: fix random hang in forcedeth driver when using netconsole
+ - libata: add ATI SB700 device IDs to AHCI driver
+
+ [ dann frazier ]
+ * [ia64] Restore config cleanup now that its safe to break the ABI
+
+ [ Bastian Blank ]
+ * Update vserver patch to 2.2.0.3.
+
+ -- Bastian Blank <waldi at debian.org> Thu, 30 Aug 2007 20:19:44 +0200
+
+linux-2.6 (2.6.22-3) unstable; urgency=low
+
+ [ dann frazier ]
+ * [ia64] Config cleanup in 2.6.22-2 broke the ABI; revert most of it
+ for now (everything but the efivars and sym53c8xx modules)
+
+ [ Martin Michlmayr ]
+ * [mipsel/r5k-cobalt] Fix a typo in the config file.
+ * [mipsel/4kc-malta] Update the config file, thanks Aurelien Jarno.
+ * [mipsel] Add patch from Yoichi Yuasa to fix IDE on Cobalt.
+
+ -- Bastian Blank <waldi at debian.org> Sun, 29 Jul 2007 13:47:38 +0200
+
+linux-2.6 (2.6.22-2) unstable; urgency=low
[ Steve Langasek ]
* [alpha] request_irq-retval.patch: capture the return value of all
@@ -75,7 +278,7 @@
-- if these requests fail anyway.
[ Christian T. Steigies ]
- * Add module.lds to kernel headers
+ * Add module.lds to kernel headers (closes: #396220)
* Enable INPUT_UINPUT on mac
* Add 2.6.22 patches from linux-m68k CVS
@@ -84,7 +287,16 @@
- nf_conntrack_h323: add checking of out-of-range on choices' index values
(CVE-2007-3642)
- -- maximilian attems <maks at debian.org> Tue, 17 Jul 2007 11:26:40 +0200
+ [ dann frazier ]
+ * [ia64] Re-enable various config options which were unintentionally
+ disabled somewhere between 2.6.21 and 2.6.22
+ * [ia64] Re-enable vserver flavour - this was somehow lost when 2.6.22
+ was merged from trunk to the sid branch
+
+ [ Bastian Blank ]
+ * Update vserver patch to 2.2.0.3-rc1.
+
+ -- Bastian Blank <waldi at debian.org> Mon, 23 Jul 2007 09:38:01 +0200
linux-2.6 (2.6.22-1) unstable; urgency=low
Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config (original)
+++ dists/trunk/linux-2.6/debian/config/alpha/config Sun Sep 16 10:29:09 2007
@@ -1361,5 +1361,5 @@
CONFIG_STALLION=m
CONFIG_ISTALLION=m
CONFIG_I2C_ELEKTOR=m
-CONFIG_MATHEMU=m
+CONFIG_MATHEMU=y
# CONFIG_AUDIT is not set
Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config (original)
+++ dists/trunk/linux-2.6/debian/config/ia64/config Sun Sep 16 10:29:09 2007
@@ -695,3 +695,186 @@
CONFIG_AGP_VIA=m
# CONFIG_BLK_DEV_IDEPNP is not set
CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IA64_UNCACHED_ALLOCATOR=y
+CONFIG_IA64_SGI_SN_XP=m
+CONFIG_HOTPLUG_CPU=y
+CONFIG_SCHED_SMT=y
+CONFIG_PERMIT_BSP_REMOVE=y
+CONFIG_IA32_SUPPORT=y
+CONFIG_COMPAT=y
+CONFIG_IA64_MCA_RECOVERY=m
+CONFIG_PERFMON=y
+CONFIG_IA64_PALINFO=m
+CONFIG_KEXEC=y
+CONFIG_CRASH_DUMP=y
+CONFIG_EFI_VARS=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=m
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_IA64_ACPI_CPUFREQ=m
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+CONFIG_PCI_MSI=y
+CONFIG_HOTPLUG_PCI=m
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+CONFIG_CARDBUS=y
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=m
+CONFIG_HAMRADIO=y
+CONFIG_IRDA=m
+CONFIG_BT=m
+CONFIG_IDE=m
+CONFIG_IDE_MAX_HWIFS=4
+CONFIG_BLK_DEV_IDE=m
+CONFIG_BLK_DEV_IDEDISK=m
+CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_IDECD=m
+CONFIG_BLK_DEV_IDETAPE=m
+CONFIG_BLK_DEV_IDEFLOPPY=m
+CONFIG_IDE_PROC_FS=y
+CONFIG_IDE_GENERIC=m
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_BLK_DEV_GENERIC=m
+CONFIG_BLK_DEV_OPTI621=m
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+CONFIG_BLK_DEV_AEC62XX=m
+CONFIG_BLK_DEV_ALI15X3=m
+CONFIG_BLK_DEV_AMD74XX=m
+CONFIG_BLK_DEV_CMD64X=m
+CONFIG_BLK_DEV_TRIFLEX=m
+CONFIG_BLK_DEV_CY82C693=m
+CONFIG_BLK_DEV_CS5520=m
+CONFIG_BLK_DEV_CS5530=m
+CONFIG_BLK_DEV_HPT34X=m
+CONFIG_BLK_DEV_HPT366=m
+CONFIG_BLK_DEV_JMICRON=m
+CONFIG_BLK_DEV_SC1200=m
+CONFIG_BLK_DEV_PIIX=m
+CONFIG_BLK_DEV_IT8213=m
+CONFIG_BLK_DEV_IT821X=m
+CONFIG_BLK_DEV_NS87415=m
+CONFIG_BLK_DEV_PDC202XX_OLD=m
+CONFIG_BLK_DEV_PDC202XX_NEW=m
+CONFIG_BLK_DEV_SVWKS=m
+CONFIG_BLK_DEV_SGIIOC4=m
+CONFIG_BLK_DEV_SIIMAGE=m
+CONFIG_BLK_DEV_SLC90E66=m
+CONFIG_BLK_DEV_TRM290=m
+CONFIG_BLK_DEV_VIA82CXXX=m
+CONFIG_BLK_DEV_TC86C001=m
+CONFIG_BLK_DEV_IDEDMA=y
+CONFIG_SCSI_ARCMSR=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+CONFIG_SCSI_IPR_DUMP=y
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_LPFC=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_PATA_ALI=m
+CONFIG_DM_MULTIPATH_EMC=m
+CONFIG_IEEE1394=m
+CONFIG_IEEE1394_PCILYNX=m
+CONFIG_IEEE1394_OHCI1394=m
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_I2O=m
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_I2O_CONFIG=m
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+CONFIG_NET_SB1000=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_DE4X5=y
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_3C359=m
+CONFIG_PCMCIA_WAVELAN=m
+CONFIG_PCMCIA_NETWAVE=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_HOSTAP_CS=m
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_LIBUSUAL=y
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
+CONFIG_INFINIBAND_IPATH=m
+CONFIG_PROC_VMCORE=y
+CONFIG_SYSVIPC_COMPAT=y
Modified: dists/trunk/linux-2.6/debian/config/ia64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/defines (original)
+++ dists/trunk/linux-2.6/debian/config/ia64/defines Sun Sep 16 10:29:09 2007
@@ -6,6 +6,8 @@
mckinley
kernel-arch: ia64
kernel-header-dirs: ia64
+subarches:
+ vserver
[image]
suggests: elilo, fdutils
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Sun Sep 16 10:29:09 2007
@@ -409,11 +409,85 @@
# Connector - unified userspace <-> kernelspace linker
#
# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0x0
+CONFIG_MTD_PHYSMAP_LEN=0x0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=0
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
#
-# Memory Technology Devices (MTD)
+# UBI - Unsorted block images
#
-# CONFIG_MTD is not set
+# CONFIG_MTD_UBI is not set
#
# Parallel port support
@@ -1408,6 +1482,7 @@
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
CONFIG_CRAMFS=y
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config (original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config Sun Sep 16 10:29:09 2007
@@ -401,3 +401,4 @@
# CONFIG_SND_HDA_INTEL is not set
# MII PHY device drivers
CONFIG_SCSI_ARCMSR=m
+# CONFIG_SCSI_SCAN_ASYNC is not set
Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in (original)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in Sun Sep 16 10:29:09 2007
@@ -3,7 +3,7 @@
Priority: optional
Provides: linux-image, linux-image- at major@, linux-modules- at upstreamversion@@abiname@@localversion@
Pre-Depends: debconf (>= 0.2.17) | debconf-2.0
-Depends: module-init-tools (>= 0.9.13), coreutils (>= 5.2.1)
+Depends: module-init-tools (>= 0.9.13), coreutils (>= 5.96)
Suggests: linux-doc- at version@
Description: Linux @upstreamversion@ image on @class@
This package provides the binary image and pre-built loadable modules for
Modified: dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-1tainted
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-1tainted (original)
+++ dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-1tainted Sun Sep 16 10:29:09 2007
@@ -9,13 +9,13 @@
tainted=$(cat /proc/sys/kernel/tainted)
if [ "$tainted" -gt 0 ]; then
local s
- [ $(($tainted & $TAINT_PROPRIETARY_MODULE)) ] && s="P" || s="G"
- [ $(($tainted & $TAINT_FORCED_MODULE)) ] && s="${s}F"
- [ $(($tainted & $TAINT_UNSAFE_SMP)) ] && s="${s}S"
- [ $(($tainted & $TAINT_FORCED_RMMOD)) ] && s="${s}R"
- [ $(($tainted & $TAINT_MACHINE_CHECK)) ] && s="${s}M"
- [ $(($tainted & $TAINT_BAD_PAGE)) ] && s="${s}B"
- echo '** Tainted:' $s >&3
+ [ $(($tainted & $TAINT_PROPRIETARY_MODULE)) -ne 0 ] && s="P" || s="G"
+ [ $(($tainted & $TAINT_FORCED_MODULE)) -ne 0 ] && s="${s}F" || s="$s "
+ [ $(($tainted & $TAINT_UNSAFE_SMP)) -ne 0 ] && s="${s}S" || s="$s "
+ [ $(($tainted & $TAINT_FORCED_RMMOD)) -ne 0 ] && s="${s}R" || s="$s "
+ [ $(($tainted & $TAINT_MACHINE_CHECK)) -ne 0 ] && s="${s}M" || s="$s "
+ [ $(($tainted & $TAINT_BAD_PAGE)) -ne 0 ] && s="${s}B" || s="$s "
+ echo '** Tainted:' $s "($tainted)" >&3
echo >&3
else
echo '** Not tainted' >&3
More information about the Kernel-svn-changes
mailing list