[kernel] r15980 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/debian/dfsg patches/features/all patches/features/mips patches/series

[Ben Hutchings]

Author: benh
Date: Tue Jul 13 00:03:21 2010
New Revision: 15980

Log:
Update to 2.6.35-rc5; remove patches merged upstream

Deleted:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/kbuild-Fix-setlocalversion-invocation.patch
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/ip_qib-sd7220-disable.patch
   dists/trunk/linux-2.6/debian/patches/features/all/ib_qib-use-request_firmware-to-load-SD7220-firmware.patch
   dists/trunk/linux-2.6/debian/patches/features/mips/MIPS-Loongson-Define-rtc-device-on-MC146818-systems.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
   dists/trunk/linux-2.6/debian/patches/series/base
   dists/trunk/linux-2.6/debian/patches/series/orig-0

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Jul 11 14:21:58 2010	(r15979)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Jul 13 00:03:21 2010	(r15980)
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.35~rc5-1~experimental.1) UNRELEASED; urgency=low
+
+  * New upstream release candidate
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 13 Jul 2010 00:50:20 +0100
+
 linux-2.6 (2.6.35~rc4-1~experimental.1) experimental; urgency=low
   
   * New upstream snapshot

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Sun Jul 11 14:21:58 2010	(r15979)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1	Tue Jul 13 00:03:21 2010	(r15980)
@@ -39,8 +39,6 @@
 
 unifdef drivers/media/dvb/frontends/lgs8gxx.c -UREMOVE_DFSG
 
-rm drivers/infiniband/hw/qib/qib_sd7220_img.c
-
 rm drivers/net/appletalk/cops.c
 rm drivers/net/appletalk/cops.h
 rm drivers/net/appletalk/cops_ffdrv.h

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch	Sun Jul 11 14:21:58 2010	(r15979)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch	Tue Jul 13 00:03:21 2010	(r15980)
@@ -56,7 +56,7 @@
  fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \
  				     cis/DP83903.cis cis/NE2K.cis \
  				     cis/tamarack.cis cis/PE-200.cis \
-@@ -77,66 +32,8 @@ fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
+@@ -77,67 +32,8 @@ fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
  				       cis/COMpad2.cis cis/COMpad4.cis \
  				       cis/SW_555_SER.cis cis/SW_7xx_SER.cis \
  				       cis/SW_8xx_SER.cis
@@ -66,6 +66,7 @@
 -fw-shipped-$(CONFIG_SCSI_QLOGIC_1280) += qlogic/1040.bin qlogic/1280.bin \
 -					 qlogic/12160.bin
 -fw-shipped-$(CONFIG_SCSI_QLOGICPTI) += qlogic/isp1000.bin
+-fw-shipped-$(CONFIG_INFINIBAND_QIB) += qlogic/sd7220.fw
 -fw-shipped-$(CONFIG_SMCTR) += tr_smctr.bin
 -fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp
 -fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Sun Jul 11 14:21:58 2010	(r15979)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Tue Jul 13 00:03:21 2010	(r15980)
@@ -5,7 +5,6 @@
 
 + debian/piix-disable-redundant-devids.patch
 
-+ features/all/ib_qib-use-request_firmware-to-load-SD7220-firmware.patch
 + features/all/drivers-media-dvb-usb-af9005-request_firmware.patch
 
 + features/all/lgs8gxx-lgs8g75-request_firmware.patch
@@ -45,7 +44,6 @@
 
 + bugfix/mips/mips-ide-flush-dcache.patch
 #+ bugfix/all/thinkpad-acpi-fix-backlight.patch
-+ features/mips/MIPS-Loongson-Define-rtc-device-on-MC146818-systems.patch
 + features/all/revert-ipv4-Make-INET_LRO-a-bool-instead-of-tristate.patch
 + bugfix/all/ipr-add-writeq-definition-if-needed.patch
 + bugfix/mips/mips-Set-io_map_base-for-several-PCI-bridges-lacking.patch
@@ -61,4 +59,3 @@
 + bugfix/all/ipv6-Use-interface-max_desync_factor.patch
 + bugfix/all/rtl8192su-Clean-up-in-case-of-an-error-in-mo.patch
 + bugfix/all/rtl8192su-Fix-procfs-code-for-interfaces-not.patch
-+ bugfix/all/kbuild-Fix-setlocalversion-invocation.patch

Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0	Sun Jul 11 14:21:58 2010	(r15979)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0	Tue Jul 13 00:03:21 2010	(r15980)
@@ -1,6 +1,5 @@
 + debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
 + debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
-+ debian/dfsg/ip_qib-sd7220-disable.patch
 + debian/dfsg/drivers-net-appletalk-cops.patch
 + debian/dfsg/drivers-staging-otus-disable.patch                               
 + debian/dfsg/rtl8192u_usb-Remove-built-in-firmware.patch