[kernel] r13350 - in dists/trunk/linux-2.6: . debian debian/config/arm debian/config/hppa debian/config/mips debian/config/mipsel debian/templates

Bastian Blank waldi at alioth.debian.org
Mon Apr 6 10:36:48 UTC 2009 

Author: waldi
Date: Mon Apr  6 10:36:47 2009
New Revision: 13350

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

Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/config/hppa/defines
   dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
   dists/trunk/linux-2.6/debian/rules.real
   dists/trunk/linux-2.6/debian/templates/control.libc-dev.in

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Apr  6 10:32:23 2009	(r13349)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Apr  6 10:36:47 2009	(r13350)
@@ -10,7 +10,75 @@
 
  -- maximilian attems <maks at debian.org>  Mon, 30 Mar 2009 14:40:26 +0200
 
-linux-2.6 (2.6.29-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.29-2) unstable; urgency=low
+
+  [ Martin Michlmayr ]
+  * [arm/ixp4xx] Build in LEDS_TRIGGER_TIMER (closes: #521141).
+  * [mips*/4kc-malta, mips*/5kc-malta] Build in RTC_DRV_CMOS.
+
+  [ maximilian attems ]
+  * linux-libc-dev: Bump versioned replaces libdrm-dev.
+  * parisc: hardcode gcc-4.3 usage.
+  * Postrm cleanup new module-init-tools 3.7 files.
+
+  [ Bastian Blank ]
+  * Install all needed Makefiles into common headers package.
+    (closes: #521472)
+  * Add stable release 2.6.29.1:
+    - V4L: v4l2-common: remove incorrect MODULE test
+    - sparc64: Fix reset hangs on Niagara systems.
+    - sparc64: Flush TLB before releasing pages.
+    - sparc64: Fix MM refcount check in smp_flush_tlb_pending().
+    - KVM: MMU: Fix another largepage memory leak
+    - cfg80211: fix incorrect assumption on last_request for 11d
+    - lguest: fix spurious BUG_ON() on invalid guest stack.
+    - lguest: wire up pte_update/pte_update_defer
+    - VM, x86, PAT: Change is_linear_pfn_mapping to not use vm_pgoff
+    - x86: mtrr: don't modify RdDram/WrDram bits of fixed MTRRs
+    - x86: ptrace, bts: fix an unreachable statement
+    - x86: fix 64k corruption-check
+    - x86, uv: fix cpumask iterator in uv_bau_init()
+    - x86, PAT, PCI: Change vma prot in pci_mmap to reflect inherited prot
+    - Add a missing unlock_kernel() in raw_open()
+    - fuse: fix fuse_file_lseek returning with lock held
+    - ARM: 5435/1: fix compile warning in sanity_check_meminfo()
+    - ARM: twl4030 - leak fix
+    - ARM: fix leak in iop13xx/pci
+    - ARM: cumana: Fix a long standing bogon
+    - ARM: 5428/1: Module relocation update for R_ARM_V4BX
+    - ARM: pxa: fix overlay being un-necessarily initialized on pxa25x
+    - DVB: firedtv: FireDTV S2 problems with tuning solved
+    - cfg80211: force last_request to be set for OLD_REG if regdom is EU
+    - CIFS: Fix memory overwrite when saving nativeFileSystem field during mount
+    - ath5k: warn and correct rate for unknown hw rate indexes
+    - ath5k: disable MIB interrupts
+    - b43: fix b43_plcp_get_bitrate_idx_ofdm return type
+    - ath9k: fix dma mapping leak of rx buffer upon rmmod
+    - ath5k: use spin_lock_irqsave for beacon lock
+    - cifs: fix buffer format byte on NT Rename/hardlink
+    - ath9k: downgrade xmit queue full message to xmit debug
+    - KVM: SVM: set accessed bit for VMCB segment selectors
+    - KVM: VMX: Don't allow uninhibited access to EFER on i386
+    - USB: add quirk to avoid config and interface strings
+    - USB: gadget: fix rndis regression
+    - USB: usb-storage: increase max_sectors for tape drives
+    - USB: fix USB_STORAGE_CYPRESS_ATACB
+    - USB: EHCI: add software retry for transaction errors
+    - xfrm: spin_lock() should be spin_unlock() in xfrm_state.c
+    - ipv6: Plug sk_buff leak in ipv6_rcv (net/ipv6/ip6_input.c)
+    - GRO: Disable GRO on legacy netif_rx path (closes: #521691)
+    - bridge: bad error handling when adding invalid ether address
+    - dnet: drivers/net/dnet.c needs <linux/io.h>
+    - udp: Wrong locking code in udp seq_file infrastructure
+    - netfilter: nf_conntrack_tcp: fix unaligned memory access in tcp_sack
+
+  [ dann frazier ]
+  * bnx2: correct firmware revisions (closes: #522049)
+  * [mips] Zero upper 32-bits of compat llseek (closes: #521016)
+
+ -- Bastian Blank <waldi at debian.org>  Sat, 04 Apr 2009 15:13:33 +0200
+
+linux-2.6 (2.6.29-1) unstable; urgency=low
 
   * New upstream release
     - tg3 use request_firmware and firmware nuked.
@@ -58,6 +126,7 @@
 
   [ Bastian Blank ]
   * Use external source directory for all builds.
+  * Use external source directory for all header packages.
   * Use dh_prep.
   * Update copyright file.
   * [s390/s390] Disable BTRFS.
@@ -105,7 +174,7 @@
     - tehuti (closes: #501153)
     - typhoon (closes: #502669)
 
- -- Ben Hutchings <ben at decadent.org.uk>  Sun, 22 Feb 2009 03:14:38 +0000
+ -- Bastian Blank <waldi at debian.org>  Tue, 24 Mar 2009 14:32:11 +0100
 
 linux-2.6 (2.6.28-1) unstable; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx	Mon Apr  6 10:32:23 2009	(r13349)
+++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx	Mon Apr  6 10:36:47 2009	(r13350)
@@ -358,6 +358,8 @@
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_FSG=y
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
 
 ##
 ## file: drivers/media/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/hppa/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/defines	Mon Apr  6 10:32:23 2009	(r13349)
+++ dists/trunk/linux-2.6/debian/config/hppa/defines	Mon Apr  6 10:36:47 2009	(r13350)
@@ -26,5 +26,5 @@
 override-host-type: hppa64-linux-gnu
 
 [relations]
-gcc-4.1: gcc-4.1, binutils-hppa64, gcc-4.1-hppa64
+gcc-4.3: gcc-4.3, binutils-hppa64, gcc-4.3-hppa64
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Mon Apr  6 10:32:23 2009	(r13349)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Mon Apr  6 10:36:47 2009	(r13350)
@@ -233,7 +233,6 @@
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
-CONFIG_RTC=y
 CONFIG_DTLK=m
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
@@ -1062,7 +1061,7 @@
 ##
 ## file: drivers/rtc/Kconfig
 ##
-CONFIG_RTC_CLASS=m
+CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
@@ -1081,6 +1080,7 @@
 # CONFIG_RTC_DRV_DS1742 is not set
 CONFIG_RTC_DRV_M48T86=m
 # CONFIG_RTC_DRV_V3020 is not set
+CONFIG_RTC_DRV_CMOS=y
 
 ##
 ## file: drivers/scsi/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Mon Apr  6 10:32:23 2009	(r13349)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Mon Apr  6 10:36:47 2009	(r13350)
@@ -220,7 +220,6 @@
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
-CONFIG_RTC=y
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
 
@@ -1302,7 +1301,7 @@
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 CONFIG_RTC_DRV_M48T86=m

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	Mon Apr  6 10:32:23 2009	(r13349)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	Mon Apr  6 10:36:47 2009	(r13350)
@@ -233,7 +233,6 @@
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
-CONFIG_RTC=y
 CONFIG_DTLK=m
 CONFIG_APPLICOM=m
 
@@ -1061,7 +1060,7 @@
 ##
 ## file: drivers/rtc/Kconfig
 ##
-CONFIG_RTC_CLASS=m
+CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
@@ -1080,6 +1079,7 @@
 # CONFIG_RTC_DRV_DS1742 is not set
 CONFIG_RTC_DRV_M48T86=m
 # CONFIG_RTC_DRV_V3020 is not set
+CONFIG_RTC_DRV_CMOS=y
 
 ##
 ## file: drivers/scsi/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	Mon Apr  6 10:32:23 2009	(r13349)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	Mon Apr  6 10:36:47 2009	(r13350)
@@ -220,7 +220,6 @@
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
-CONFIG_RTC=y
 CONFIG_APPLICOM=m
 
 ##
@@ -1286,7 +1285,7 @@
 ##
 ## file: drivers/rtc/Kconfig
 ##
-CONFIG_RTC_CLASS=m
+CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
@@ -1302,7 +1301,7 @@
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_CMOS=m
+CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 CONFIG_RTC_DRV_M48T86=m

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Mon Apr  6 10:32:23 2009	(r13349)
+++ dists/trunk/linux-2.6/debian/rules.real	Mon Apr  6 10:36:47 2009	(r13350)
@@ -198,7 +198,7 @@
 	cd $(SOURCE_DIR); \
 	( \
 	  echo Makefile; \
-	  echo arch/$(KERNEL_ARCH)/Makefile; \
+	  find arch/$(KERNEL_ARCH) -maxdepth 1 -name 'Makefile*' -print; \
 	  find arch/$(KERNEL_ARCH) -name 'module.lds' -print; \
 	  find arch/$(KERNEL_ARCH)/include -print; \
 	  find include -name 'asm*' -prune -o -print; \

Modified: dists/trunk/linux-2.6/debian/templates/control.libc-dev.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.libc-dev.in	Mon Apr  6 10:32:23 2009	(r13349)
+++ dists/trunk/linux-2.6/debian/templates/control.libc-dev.in	Mon Apr  6 10:36:47 2009	(r13350)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Provides: linux-kernel-headers
-Replaces: linux-kernel-headers, libdrm-dev (<< 2.4.5)
+Replaces: linux-kernel-headers, libdrm-dev (<= 2.4.5-1)
 Conflicts: linux-kernel-headers
 Description: Linux support headers for userspace development
  This package provides userspaces headers from the Linux kernel.  These headers

More information about the Kernel-svn-changes mailing list