[kernel] r10983 - in dists/trunk/linux-2.6: . debian debian/bin debian/config/s390

Fri Mar 28 09:35:59 UTC 2008

Author: waldi
Date: Fri Mar 28 09:35:58 2008
New Revision: 10983

Log:
Merge /dists/sid/linux-2.6.


Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/s390/defines
   dists/trunk/linux-2.6/debian/rules.real

Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================

--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Fri Mar 28 09:35:58 2008
@@ -82,7 +82,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 (
             ('compiler', 'COMPILER'),
             ('kernel-arch', 'KERNEL_ARCH'),
@@ -95,6 +103,7 @@
             ('initramfs', 'INITRAMFS'),
             ('kpkg-arch', 'KPKG_ARCH'),
             ('kpkg-subarch', 'KPKG_SUBARCH'),
+            ('localversion-image', 'LOCALVERSION_IMAGE'),
             ('override-host-type', 'OVERRIDE_HOST_TYPE'),
         ):
             if vars.has_key(i[0]):

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Mar 28 09:35:58 2008
@@ -88,13 +88,236 @@
 
  -- Bastian Blank <waldi at debian.org>  Tue, 26 Feb 2008 23:59:55 -0700
 
-linux-2.6 (2.6.24-2) UNRELEASED; urgency=low
+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:
+    - splice: missing user pointer access verification (CVE-2008-0009/10)
+    - drm: the drm really should call pci_set_master..
+    - Driver core: Revert "Fix Firmware class name collision"
+    - fix writev regression: pan hanging unkillable and un-straceable
+    - sched: fix high wake up latencies with FAIR_USER_SCHED
+    - sched: let +nice tasks have smaller impact
+    - b43: Reject new firmware early
+    - selinux: fix labeling of /proc/net inodes
+    - b43legacy: fix DMA slot resource leakage
+    - b43legacy: drop packets we are not able to encrypt
+    - b43legacy: fix suspend/resume
+    - b43legacy: fix PIO crash
+    - b43: Fix dma-slot resource leakage
+    - b43: Drop packets we are not able to encrypt
+    - b43: Fix suspend/resume
+    - sky2: fix for WOL on some devices
+    - sky2: restore multicast addresses after recovery
+    - x86: restore correct module name for apm
+    - ACPI: update ACPI blacklist
+    - PCI: Fix fakephp deadlock
+    - sys_remap_file_pages: fix ->vm_file accounting
+    - lockdep: annotate epoll
+    - forcedeth: mac address mcp77/79
+    - USB: Fix usb_serial_driver structure for Kobil cardreader driver.
+    - USB: handle idVendor of 0x0000
+    - USB: fix usbtest halt check on big endian systems
+    - USB: storage: Add unusual_dev for HP r707
+    - USB: Variant of the Dell Wireless 5520 driver
+    - USB: use GFP_NOIO in reset path
+    - USB: ftdi driver - add support for optical probe device
+    - USB: pl2303: add support for RATOC REX-USB60F
+    - USB: remove duplicate entry in Option driver and Pl2303 driver for Huawei modem
+    - USB: sierra: add support for Onda H600/Zte MF330 datacard to USB Driver for Sierra Wireless
+    - USB: ftdi-sio: Patch to add vendor/device id for ATK_16IC CCD
+    - USB: ftdi_sio - enabling multiple ELV devices, adding EM1010PC
+    - USB: sierra driver - add devices
+    - USB: Adding YC Cable USB Serial device to pl2303
+    - USB: Sierra - Add support for Aircard 881U
+    - USB: add support for 4348:5523 WinChipHead USB->RS 232 adapter
+    - USB: CP2101 New Device IDs
+    - usb gadget: fix fsl_usb2_udc potential OOPS
+    - USB: keyspan: Fix oops
+    - vm audit: add VM_DONTEXPAND to mmap for drivers that need it (CVE-2008-0007)
+    - slab: fix bootstrap on memoryless node
+    - DVB: cx23885: add missing subsystem ID for Hauppauge HVR1800 Retail
+
+  [ Martin Michlmayr ]
+  * [arm/ixp4xx] Enble ATA_OVER_ETH, requested by Nicola Fankhauser.
+  * [arm/iop32x] Enble ATA_OVER_ETH.
+
+  [ Bastian Blank ]
+  * Add stable release 2.6.24.2:
+    - splice: fix user pointer access in get_iovec_page_array()
+    (CVE-2008-0600, closes: #464945)
+
+ -- Bastian Blank <waldi at debian.org>  Mon, 11 Feb 2008 12:29:23 +0100
+
+linux-2.6 (2.6.24-3) unstable; urgency=low
+
+  [ maximilian attems ]
+  * [scsi]: hptiop: add more adapter models and fixes.
+  * [amd64, i386]: Reenable ACPI_PROCFS_POWER. (closes: #463253)
+
+  [ Gordon Farquharson ]
+  * [arm/ixp4xx] Update Ethernet driver so that it can be loaded by udev
+    automatically.
+
+  [ Martin Michlmayr ]
+  * [mips/r5k-ip32] Enable R8169, requested by Giuseppe Sacco. (Closes:
+    #463705)
+
+ -- Bastian Blank <waldi at debian.org>  Wed, 06 Feb 2008 13:05:18 +0100
+
+linux-2.6 (2.6.24-2) unstable; urgency=low
+
+  [ Bastian Blank ]
   * Fix broken merge of flavour specific settings.
     - [i386]: Recommends are fixed.
     - [s390/s390-tape]: Built as small image again.
 
- -- Bastian Blank <waldi at debian.org>  Mon, 28 Jan 2008 17:48:04 +0100
+  [ maximilian attems ]
+  * Disable old dup prism54 driver.
+  * Stable queue: slab: fix bootstrap on memoryless node.
+
+  [ Aurelien Jarno ]
+  * [arm]: Remove options that are present in topconfig from config.versatile.
+  * [arm]: Turn off B44 since it fails to compile on armel.
+
+ -- Bastian Blank <waldi at debian.org>  Thu, 31 Jan 2008 17:37:00 +0100
 
 linux-2.6 (2.6.24-1) unstable; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/config/s390/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/s390/defines	Fri Mar 28 09:35:58 2008
@@ -21,6 +21,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/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Fri Mar 28 09:35:58 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 '$@'
 

