[kernel] r10993 - in dists/etch/linux-2.6.24/debian: . abi/2.6.24-1 bin config/arm config/mips config/s390 patches/bugfix patches/bugfix/all patches/bugfix/all/stable patches/bugfix/arm patches/series

Dann Frazier dannf at alioth.debian.org
Fri Mar 28 20:15:46 UTC 2008


Author: dannf
Date: Fri Mar 28 20:15:44 2008
New Revision: 10993

Log:
merge in 2.6.24-5

Added:
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/arm_none_footbridge
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/abi/2.6.24-1/arm_none_footbridge
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/arm_none_iop32x
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/abi/2.6.24-1/arm_none_iop32x
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/arm_none_ixp4xx
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/abi/2.6.24-1/arm_none_ixp4xx
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/armel_none_iop32x
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/abi/2.6.24-1/armel_none_iop32x
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/armel_none_ixp4xx
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/abi/2.6.24-1/armel_none_ixp4xx
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/armel_none_versatile
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/abi/2.6.24-1/armel_none_versatile
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/hppa_none_parisc
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/abi/2.6.24-1/hppa_none_parisc
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/hppa_none_parisc-smp
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/abi/2.6.24-1/hppa_none_parisc-smp
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/hppa_none_parisc64
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/abi/2.6.24-1/hppa_none_parisc64
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/hppa_none_parisc64-smp
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/abi/2.6.24-1/hppa_none_parisc64-smp
   dists/etch/linux-2.6.24/debian/patches/bugfix/all/file2alias-cross-compile-fix.patch
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/patches/bugfix/all/file2alias-cross-compile-fix.patch
   dists/etch/linux-2.6.24/debian/patches/bugfix/all/stable/2.6.24.3.patch
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/patches/bugfix/all/stable/2.6.24.3.patch
   dists/etch/linux-2.6.24/debian/patches/bugfix/all/stable/2.6.24.4.patch
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/patches/bugfix/all/stable/2.6.24.4.patch
   dists/etch/linux-2.6.24/debian/patches/bugfix/arm/ixp4xx-update-2.patch
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/patches/bugfix/arm/ixp4xx-update-2.patch
   dists/etch/linux-2.6.24/debian/patches/bugfix/cap-remove-cap_task_kill.patch
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/patches/bugfix/cap-remove-cap_task_kill.patch
   dists/etch/linux-2.6.24/debian/patches/series/5
      - copied unchanged from r10982, /releases/linux-2.6/2.6.24-5/debian/patches/series/5
Modified:
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/amd64_none_amd64
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_486
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_686
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_686-bigmem
   dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_amd64
   dists/etch/linux-2.6.24/debian/bin/gencontrol.py
   dists/etch/linux-2.6.24/debian/changelog
   dists/etch/linux-2.6.24/debian/config/arm/config
   dists/etch/linux-2.6.24/debian/config/arm/config.iop32x
   dists/etch/linux-2.6.24/debian/config/arm/config.ixp4xx
   dists/etch/linux-2.6.24/debian/config/mips/config.r4k-ip22
   dists/etch/linux-2.6.24/debian/config/mips/config.r5k-ip32
   dists/etch/linux-2.6.24/debian/config/s390/defines
   dists/etch/linux-2.6.24/debian/rules.real

Modified: dists/etch/linux-2.6.24/debian/abi/2.6.24-1/amd64_none_amd64
==============================================================================
--- dists/etch/linux-2.6.24/debian/abi/2.6.24-1/amd64_none_amd64	(original)
+++ dists/etch/linux-2.6.24/debian/abi/2.6.24-1/amd64_none_amd64	Fri Mar 28 20:15:44 2008
@@ -386,6 +386,8 @@
 0xce4904a4 acpi_leave_sleep_state vmlinux EXPORT_SYMBOL
 0x208739f6 acpi_load_table vmlinux EXPORT_SYMBOL
 0xd08197fa acpi_load_tables vmlinux EXPORT_SYMBOL
+0x17898c10 acpi_lock_ac_dir vmlinux EXPORT_SYMBOL
+0x6b387b0a acpi_lock_battery_dir vmlinux EXPORT_SYMBOL
 0xda0a6b0e acpi_map_lsapic vmlinux EXPORT_SYMBOL
 0x77daa0d5 acpi_match_device_ids vmlinux EXPORT_SYMBOL
 0xf0bcc0b3 acpi_os_create_semaphore vmlinux EXPORT_SYMBOL
@@ -438,6 +440,8 @@
 0xa59c0666 acpi_strict vmlinux EXPORT_SYMBOL
 0xb34d4c2e acpi_terminate vmlinux EXPORT_SYMBOL
 0xac58ea5e acpi_unload_table_id vmlinux EXPORT_SYMBOL
+0xa732799f acpi_unlock_ac_dir vmlinux EXPORT_SYMBOL
+0xa75d6a19 acpi_unlock_battery_dir vmlinux EXPORT_SYMBOL
 0xd18b6eb2 acpi_unmap_lsapic vmlinux EXPORT_SYMBOL
 0xe716baed acpi_unregister_ioapic vmlinux EXPORT_SYMBOL
 0xc9fd878f acpi_ut_exception vmlinux EXPORT_SYMBOL

Modified: dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_486
==============================================================================
--- dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_486	(original)
+++ dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_486	Fri Mar 28 20:15:44 2008
@@ -335,6 +335,8 @@
 0xce4904a4 acpi_leave_sleep_state vmlinux EXPORT_SYMBOL
 0x208739f6 acpi_load_table vmlinux EXPORT_SYMBOL
 0xd08197fa acpi_load_tables vmlinux EXPORT_SYMBOL
+0x037cca69 acpi_lock_ac_dir vmlinux EXPORT_SYMBOL
+0xbc24983b acpi_lock_battery_dir vmlinux EXPORT_SYMBOL
 0xc9e9d3a2 acpi_match_device_ids vmlinux EXPORT_SYMBOL
 0xf0bcc0b3 acpi_os_create_semaphore vmlinux EXPORT_SYMBOL
 0xf82f48fc acpi_os_delete_semaphore vmlinux EXPORT_SYMBOL
@@ -386,6 +388,8 @@
 0xa59c0666 acpi_strict vmlinux EXPORT_SYMBOL
 0xb34d4c2e acpi_terminate vmlinux EXPORT_SYMBOL
 0xac58ea5e acpi_unload_table_id vmlinux EXPORT_SYMBOL
+0xb2aecb11 acpi_unlock_ac_dir vmlinux EXPORT_SYMBOL
+0x293afb7c acpi_unlock_battery_dir vmlinux EXPORT_SYMBOL
 0xe716baed acpi_unregister_ioapic vmlinux EXPORT_SYMBOL
 0xc9fd878f acpi_ut_exception vmlinux EXPORT_SYMBOL
 0x19d5d20a acpi_walk_namespace vmlinux EXPORT_SYMBOL

Modified: dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_686
==============================================================================
--- dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_686	(original)
+++ dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_686	Fri Mar 28 20:15:44 2008
@@ -372,6 +372,8 @@
 0xce4904a4 acpi_leave_sleep_state vmlinux EXPORT_SYMBOL
 0x208739f6 acpi_load_table vmlinux EXPORT_SYMBOL
 0xd08197fa acpi_load_tables vmlinux EXPORT_SYMBOL
+0x05f72669 acpi_lock_ac_dir vmlinux EXPORT_SYMBOL
+0x9bb7355c acpi_lock_battery_dir vmlinux EXPORT_SYMBOL
 0xda0a6b0e acpi_map_lsapic vmlinux EXPORT_SYMBOL
 0x500d6d8d acpi_match_device_ids vmlinux EXPORT_SYMBOL
 0xf0bcc0b3 acpi_os_create_semaphore vmlinux EXPORT_SYMBOL
@@ -424,6 +426,8 @@
 0xa59c0666 acpi_strict vmlinux EXPORT_SYMBOL
 0xb34d4c2e acpi_terminate vmlinux EXPORT_SYMBOL
 0xac58ea5e acpi_unload_table_id vmlinux EXPORT_SYMBOL
+0xfe258ff7 acpi_unlock_ac_dir vmlinux EXPORT_SYMBOL
+0xc592221c acpi_unlock_battery_dir vmlinux EXPORT_SYMBOL
 0xd18b6eb2 acpi_unmap_lsapic vmlinux EXPORT_SYMBOL
 0xe716baed acpi_unregister_ioapic vmlinux EXPORT_SYMBOL
 0xc9fd878f acpi_ut_exception vmlinux EXPORT_SYMBOL

Modified: dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_686-bigmem
==============================================================================
--- dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_686-bigmem	(original)
+++ dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_686-bigmem	Fri Mar 28 20:15:44 2008
@@ -372,6 +372,8 @@
 0xce4904a4 acpi_leave_sleep_state vmlinux EXPORT_SYMBOL
 0x208739f6 acpi_load_table vmlinux EXPORT_SYMBOL
 0xd08197fa acpi_load_tables vmlinux EXPORT_SYMBOL
+0x31d1b82e acpi_lock_ac_dir vmlinux EXPORT_SYMBOL
+0xab11ee37 acpi_lock_battery_dir vmlinux EXPORT_SYMBOL
 0xda0a6b0e acpi_map_lsapic vmlinux EXPORT_SYMBOL
 0x5880e112 acpi_match_device_ids vmlinux EXPORT_SYMBOL
 0xf0bcc0b3 acpi_os_create_semaphore vmlinux EXPORT_SYMBOL
@@ -424,6 +426,8 @@
 0xa59c0666 acpi_strict vmlinux EXPORT_SYMBOL
 0xb34d4c2e acpi_terminate vmlinux EXPORT_SYMBOL
 0xac58ea5e acpi_unload_table_id vmlinux EXPORT_SYMBOL
+0x1b1dc37f acpi_unlock_ac_dir vmlinux EXPORT_SYMBOL
+0x2cfe4f22 acpi_unlock_battery_dir vmlinux EXPORT_SYMBOL
 0xd18b6eb2 acpi_unmap_lsapic vmlinux EXPORT_SYMBOL
 0xe716baed acpi_unregister_ioapic vmlinux EXPORT_SYMBOL
 0xc9fd878f acpi_ut_exception vmlinux EXPORT_SYMBOL

Modified: dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_amd64
==============================================================================
--- dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_amd64	(original)
+++ dists/etch/linux-2.6.24/debian/abi/2.6.24-1/i386_none_amd64	Fri Mar 28 20:15:44 2008
@@ -386,6 +386,8 @@
 0xce4904a4 acpi_leave_sleep_state vmlinux EXPORT_SYMBOL
 0x208739f6 acpi_load_table vmlinux EXPORT_SYMBOL
 0xd08197fa acpi_load_tables vmlinux EXPORT_SYMBOL
+0x17898c10 acpi_lock_ac_dir vmlinux EXPORT_SYMBOL
+0x6b387b0a acpi_lock_battery_dir vmlinux EXPORT_SYMBOL
 0xda0a6b0e acpi_map_lsapic vmlinux EXPORT_SYMBOL
 0x77daa0d5 acpi_match_device_ids vmlinux EXPORT_SYMBOL
 0xf0bcc0b3 acpi_os_create_semaphore vmlinux EXPORT_SYMBOL
@@ -438,6 +440,8 @@
 0xa59c0666 acpi_strict vmlinux EXPORT_SYMBOL
 0xb34d4c2e acpi_terminate vmlinux EXPORT_SYMBOL
 0xac58ea5e acpi_unload_table_id vmlinux EXPORT_SYMBOL
+0xa732799f acpi_unlock_ac_dir vmlinux EXPORT_SYMBOL
+0xa75d6a19 acpi_unlock_battery_dir vmlinux EXPORT_SYMBOL
 0xd18b6eb2 acpi_unmap_lsapic vmlinux EXPORT_SYMBOL
 0xe716baed acpi_unregister_ioapic vmlinux EXPORT_SYMBOL
 0xc9fd878f acpi_ut_exception vmlinux EXPORT_SYMBOL

Modified: dists/etch/linux-2.6.24/debian/bin/gencontrol.py
==============================================================================
--- dists/etch/linux-2.6.24/debian/bin/gencontrol.py	(original)
+++ dists/etch/linux-2.6.24/debian/bin/gencontrol.py	Fri Mar 28 20:15:44 2008
@@ -78,7 +78,15 @@
         makefile.add('source_%s_%s_real' % (arch, featureset), cmds = cmds_source)
 
     def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour, extra):
-        vars.update(self.config.merge('image', arch, featureset, flavour))
+        config_image = self.config.merge('image', arch, featureset, flavour)
+
+        vars.update(config_image)
+
+        vars['localversion-image'] = vars['localversion']
+        override_localversion = config_image.get('override-localversion', None)
+        if override_localversion is not None:
+            vars['localversion-image'] = vars['localversion_headers'] + '-' + override_localversion
+
         for i in (
             ('cflags', 'CFLAGS'),
             ('compiler', 'COMPILER'),
@@ -87,6 +95,7 @@
             ('kpkg-arch', 'KPKG_ARCH'),
             ('kpkg-subarch', 'KPKG_SUBARCH'),
             ('localversion', 'LOCALVERSION'),
+            ('localversion-image', 'LOCALVERSION_IMAGE'),
             ('override-host-type', 'OVERRIDE_HOST_TYPE'),
             ('type', 'TYPE'),
         ):

Modified: dists/etch/linux-2.6.24/debian/changelog
==============================================================================
--- dists/etch/linux-2.6.24/debian/changelog	(original)
+++ dists/etch/linux-2.6.24/debian/changelog	Fri Mar 28 20:15:44 2008
@@ -1,4 +1,4 @@
-linux-2.6.24 (2.6.24-4~etchnhalf.1) UNRELEASED; urgency=low
+linux-2.6.24 (2.6.24-5~etchnhalf.1) UNRELEASED; urgency=low
 
   * Branch and rename source to linux-2.6.24 targeted for etchnhalf.
 
@@ -15,6 +15,144 @@
 
  -- Bastian Blank <waldi at debian.org>  Mon, 17 Mar 2008 11:46:39 +0100
 
+linux-2.6 (2.6.24-5) unstable; urgency=low
+
+  [ Gordon Farquharson ]
+  * [arm] Enable asix driver (USB_NET_AX8817X).
+  * [arm] Enable CONFIG_USB_CATC, CONFIG_USB_KAWETH, CONFIG_USB_PEGASUS,
+          and CONFIG_USB_RTL8150.
+  * [arm/ixp4xx] Update Ethernet driver (closes: #471062).
+  * [arm/ixp4xx] Add HSS driver.
+
+  [ Bastian Blank ]
+  * [s390/s390-tape]: Override localversion correctly.
+  * Add stable release 2.6.24.3:
+    - x86_64: CPA, fix cache attribute inconsistency bug
+    - bonding: fix NULL pointer deref in startup processing
+    - POWERPC: Revert chrp_pci_fixup_vt8231_ata devinit to fix libata on pegasos
+    - PCMCIA: Fix station address detection in smc
+    - SCSI: gdth: scan for scsi devices
+    - USB: fix pm counter leak in usblp
+    - S390: Fix futex_atomic_cmpxchg_std inline assembly.
+    - genirq: do not leave interupts enabled on free_irq
+    - hrtimer: catch expired CLOCK_REALTIME timers early
+    - hrtimer: check relative timeouts for overflow
+    - SLUB: Deal with annoying gcc warning on kfree()
+    - hrtimer: fix *rmtp/restarts handling in compat_sys_nanosleep()
+    - hrtimer: fix *rmtp handling in hrtimer_nanosleep()
+    - Disable G5 NAP mode during SMU commands on U3
+    - Be more robust about bad arguments in get_user_pages()
+    - AUDIT: Increase skb->truesize in audit_expand
+    - BLUETOOTH: Add conn add/del workqueues to avoid connection fail.
+    - INET: Prevent out-of-sync truesize on ip_fragment slow path
+    - INET_DIAG: Fix inet_diag_lock_handler error path.
+    - IPCOMP: Fetch nexthdr before ipch is destroyed
+    - IPCOMP: Fix reception of incompressible packets
+    - IPV4: fib: fix route replacement, fib_info is shared
+    - IPV4: fib_trie: apply fixes from fib_hash
+    - PKT_SCHED: ematch: oops from uninitialized variable (resend)
+    - SELinux: Fix double free in selinux_netlbl_sock_setsid()
+    - TC: oops in em_meta
+    - TCP: Fix a bug in strategy_allowed_congestion_control
+    - SCSI: sd: handle bad lba in sense information
+    - Fix dl2k constants
+    - XFS: Fix oops in xfs_file_readdir()
+    - hugetlb: add locking for overcommit sysctl
+    - inotify: fix check for one-shot watches before destroying them
+    - NFS: Fix a potential file corruption issue when writing
+    - NETFILTER: nf_conntrack_tcp: conntrack reopening fix
+    - SPARC/SPARC64: Fix usage of .section .sched.text in assembler code.
+  * Add stable release 2.6.24.4:
+    - S390 futex: let futex_atomic_cmpxchg_pt survive early functional tests.
+    - slab: NUMA slab allocator migration bugfix
+    - relay: fix subbuf_splice_actor() adding too many pages
+    - BLUETOOTH: Fix bugs in previous conn add/del workqueue changes.
+    - SCSI advansys: Fix bug in AdvLoadMicrocode
+    - async_tx: avoid the async xor_zero_sum path when src_cnt > device->max_xor
+    - aio: bad AIO race in aio_complete() leads to process hang
+    - jbd: correctly unescape journal data blocks
+    - jbd2: correctly unescape journal data blocks
+    - zisofs: fix readpage() outside i_size
+    - NETFILTER: nfnetlink_log: fix computation of netlink skb size
+    - NETFILTER: nfnetlink_queue: fix computation of allocated size for netlink skb
+    - NETFILTER: xt_time: fix failure to match on Sundays
+    - sched_nr_migrate wrong mode bits
+    - nfsd: fix oops on access from high-numbered ports
+    - sched: fix race in schedule()
+    - SCSI: mpt fusion: don't oops if NumPhys==0
+    - SCSI: gdth: fix to internal commands execution
+    - SCSI: gdth: bugfix for the at-exit problems
+    - Fix default compose table initialization
+    - x86: don't use P6_NOPs if compiling with CONFIG_X86_GENERIC
+    - SCSI: fix BUG when sum(scatterlist) > bufflen
+    - USB: ehci: handle large bulk URBs correctly (again)
+    - USB: ftdi_sio - really enable EM1010PC
+    - USB: ftdi_sio: Workaround for broken Matrix Orbital serial port
+    - VT notifier fix for VT switch
+    - eCryptfs: make ecryptfs_prepare_write decrypt the page
+    - ioat: fix 'ack' handling, driver must ensure that 'ack' is zero
+    - macb: Fix speed setting
+    - x86: move out tick_nohz_stop_sched_tick() call from the loop
+    - atmel_spi: fix clock polarity
+    - b43: Backport bcm4311 fix
+    - arcmsr: fix IRQs disabled warning spew
+    - e1000e: Fix CRC stripping in hardware context bug
+    - PCI x86: always use conf1 to access config space below 256 bytes
+    - moduleparam: fix alpha, ia64 and ppc64 compile failures
+    - pata_hpt*, pata_serverworks: fix UDMA masking
+    - SCSI advansys: fix overrun_buf aligned bug
+    - NETFILTER: fix ebtable targets return
+    - NETFILTER: Fix incorrect use of skb_make_writable
+    - NETFILTER: nfnetlink_queue: fix SKB_LINEAR_ASSERT when mangling packet data
+    - spi: pxa2xx_spi clock polarity fix
+    - ufs: fix parenthesisation in ufs_set_fs_state()
+    - hugetlb: ensure we do not reference a surplus page after handing it to buddy
+    - file capabilities: simplify signal check
+    - futex: runtime enable pi and robust functionality
+    - futex: fix init order
+    - ARM pxa: fix clock lookup to find specific device clocks
+    - x86: replace LOCK_PREFIX in futex.h
+    - SCSI aic94xx: fix REQ_TASK_ABORT and REQ_DEVICE_RESET
+    - SCSI gdth: don't call pci_free_consistent under spinlock
+    - SCSI ips: fix data buffer accessors conversion bug
+    - usb-storage: don't access beyond the end of the sg buffer
+    - fuse: fix permission checking
+    - CRYPTO xts: Use proper alignment
+    - CRYPTO xcbc: Fix crash with IPsec
+    - SCSI ips: handle scsi_add_host() failure, and other err cleanups
+    - x86: adjust enable_NMI_through_LVT0()
+    - drivers: fix dma_get_required_mask
+    - iov_iter_advance() fix
+    - x86: Clear DF before calling signal handler (closes: #469058)
+    - ub: fix up the conversion to sg_init_table()
+    - MIPS: Mark all but i8259 interrupts as no-probe.
+    - IRQ_NOPROBE helper functions
+    - IPCOMP: Disable BH on output when using shared tfm
+    - IPCONFIG: The kernel gets no IP from some DHCP servers
+    - IPV4: Remove IP_TOS setting privilege checks.
+    - IPV6: dst_entry leak in ip4ip6_err.
+    - IPV6: Fix IPsec datagram fragmentation
+    - NET: Fix race in dev_close(). (Bug 9750)
+    - NET: Messed multicast lists after dev_mc_sync/unsync (closes: #466719)
+    - NIU: Bump driver version and release date.
+    - NIU: Fix BMAC alternate MAC address indexing.
+    - NIU: More BMAC alt MAC address fixes.
+    - TCP: Improve ipv4 established hash function.
+    - SPARC: Fix link errors with gcc-4.3
+    - SPARC64: Loosen checks in exception table handling.
+
+  [ Martin Michlmayr ]
+  * [mips/r4k-ip22] Enable BLK_DEV_LOOP and BLK_DEV_CRYPTOLOOP.
+  * [mips/r5k-ip32] Enable BLK_DEV_LOOP and BLK_DEV_CRYPTOLOOP.
+  * [mips/r4k-ip22] Enable PPP, PPPOE and SLIP.
+  * [mips/r5k-ip32] Enable PPP, PPPOE and SLIP.
+  * Don't check the section size when we're cross compiling.
+
+  [ dann frazier ]
+  * Remove cap_task_kill (closes: #463669)
+
+ -- Bastian Blank <waldi at debian.org>  Thu, 27 Mar 2008 12:40:16 +0100
+
 linux-2.6 (2.6.24-4) unstable; urgency=low
 
   * Add stable release 2.6.24.1:

Modified: dists/etch/linux-2.6.24/debian/config/arm/config
==============================================================================
--- dists/etch/linux-2.6.24/debian/config/arm/config	(original)
+++ dists/etch/linux-2.6.24/debian/config/arm/config	Fri Mar 28 20:15:44 2008
@@ -26,3 +26,8 @@
 # CONFIG_SCSI_QLA_ISCSI is not set
 # CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_HPTIOP is not set
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET=m

Modified: dists/etch/linux-2.6.24/debian/config/arm/config.iop32x
==============================================================================
--- dists/etch/linux-2.6.24/debian/config/arm/config.iop32x	(original)
+++ dists/etch/linux-2.6.24/debian/config/arm/config.iop32x	Fri Mar 28 20:15:44 2008
@@ -167,8 +167,6 @@
 #
 # Networking
 #
-CONFIG_NET=y
-CONFIG_USB_USBNET=m
 CONFIG_PPP=m
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPP_FILTER=y

Modified: dists/etch/linux-2.6.24/debian/config/arm/config.ixp4xx
==============================================================================
--- dists/etch/linux-2.6.24/debian/config/arm/config.ixp4xx	(original)
+++ dists/etch/linux-2.6.24/debian/config/arm/config.ixp4xx	Fri Mar 28 20:15:44 2008
@@ -178,11 +178,6 @@
 # CONFIG_APM is not set
 
 #
-# Networking
-#
-CONFIG_NET=y
-
-#
 # Networking options
 #
 CONFIG_PACKET=y

Modified: dists/etch/linux-2.6.24/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/etch/linux-2.6.24/debian/config/mips/config.r4k-ip22	(original)
+++ dists/etch/linux-2.6.24/debian/config/mips/config.r4k-ip22	Fri Mar 28 20:15:44 2008
@@ -274,6 +274,8 @@
 #
 # Block devices
 #
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
@@ -403,6 +405,19 @@
 #
 # CONFIG_TR is not set
 
+CONFIG_PPP=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+
 #
 # ISDN subsystem
 #

Modified: dists/etch/linux-2.6.24/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/etch/linux-2.6.24/debian/config/mips/config.r5k-ip32	(original)
+++ dists/etch/linux-2.6.24/debian/config/mips/config.r5k-ip32	Fri Mar 28 20:15:44 2008
@@ -282,6 +282,8 @@
 #
 # Block devices
 #
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
@@ -443,6 +445,19 @@
 #
 # CONFIG_TR is not set
 
+CONFIG_PPP=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+
 #
 # ISDN subsystem
 #

Modified: dists/etch/linux-2.6.24/debian/config/s390/defines
==============================================================================
--- dists/etch/linux-2.6.24/debian/config/s390/defines	(original)
+++ dists/etch/linux-2.6.24/debian/config/s390/defines	Fri Mar 28 20:15:44 2008
@@ -22,6 +22,7 @@
 [s390-tape_image]
 desc: This kernel has support to IPL (boot) from a tape.
 initramfs: false
+override-localversion: s390
 type: plain-s390-tape
 
 [s390x_base]

Modified: dists/etch/linux-2.6.24/debian/rules.real
==============================================================================
--- dists/etch/linux-2.6.24/debian/rules.real	(original)
+++ dists/etch/linux-2.6.24/debian/rules.real	Fri Mar 28 20:15:44 2008
@@ -104,7 +104,7 @@
 	rm -rf '$(DIR)'
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
 	cp '$(CONFIG)' '$(DIR)/.config'
-	echo '$(ABINAME)$(LOCALVERSION)' > '$(DIR)/localversion'
+	echo '$(ABINAME)$(LOCALVERSION_IMAGE)' > '$(DIR)/localversion'
 	echo 'override ARCH = $(KERNEL_ARCH)' >> '$(DIR)/.kernelvariables'
 	echo 'CCACHE = ccache' >> '$(DIR)/.kernelvariables'
 	echo 'CC = $$(if $$(DEBIAN_KERNEL_USE_CCACHE),$$(CCACHE)) $$(CROSS_COMPILE)$(COMPILER)' >> '$(DIR)/.kernelvariables'
@@ -147,10 +147,12 @@
 	python debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
 	touch '$@'
 
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape: BUILD_TARGET = image
+
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain \
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape \
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen:
-	$(MAKE_CLEAN) -C '$(DIR)' $(JOBS_ARG)
+	$(MAKE_CLEAN) -C '$(DIR)' $(JOBS_ARG) $(BUILD_TARGET)
 	python debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
 	touch '$@'
 



More information about the Kernel-svn-changes mailing list