debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

- merge series files for 2.6.14+2.6.15-rc1-0experimental.1. 

- qla2xxx driver was relicensed: don't prune it anymore.

svn path=/dists/trunk/linux-2.6/; revision=4828
This commit is contained in:
Frederik Schüler 2005-11-15 12:53:20 +00:00
parent 672683d536
commit b5492b58d9
5 changed files with 29 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
debian/patches-debian/qla2xxx-removed.patch vendored
View File

@ -1,20 +0,0 @@
diff -aurN a/drivers/scsi/Makefile b/drivers/scsi/Makefile
--- a/drivers/scsi/Makefile 2005-06-17 15:48:29.000000000 -0400
+++ b/drivers/scsi/Makefile 2005-06-18 15:19:15.000000000 -0400
@@ -79,7 +79,6 @@
obj-$(CONFIG_SCSI_QLOGIC_ISP) += qlogicisp.o
obj-$(CONFIG_SCSI_QLOGIC_FC) += qlogicfc.o
obj-$(CONFIG_SCSI_QLOGIC_1280) += qla1280.o
-obj-$(CONFIG_SCSI_QLA2XXX) += qla2xxx/
obj-$(CONFIG_SCSI_LPFC) += lpfc/
obj-$(CONFIG_SCSI_PAS16) += pas16.o
obj-$(CONFIG_SCSI_SEAGATE) += seagate.o
--- a/drivers/scsi/qla2xxx/Kconfig 2005-10-18 20:05:54.000000000 +0900
+++ b/drivers/scsi/qla2xxx/Kconfig 2005-10-18 20:06:07.000000000 +0900
@@ -1,5 +1,5 @@
config SCSI_QLA2XXX
tristate
- default (SCSI && PCI)
+ default (n)
depends on SCSI && PCI

29
debian/patches-debian/series/2.6.14+2.6.15-rc1-0experimental.1 vendored Normal file
View File

@ -0,0 +1,29 @@
#+ amd64-int3-fix.patch
+ fbdev-radeon-noaccel.patch
+ fs-asfs-2.patch
+ ia64-irq-affinity-upfix.patch
#+ modular-ide.patch
+ modular-ide-pnp.patch
#+ powerpc-calibrate-tau.patch
#+ powerpc-g3-750cxe.patch
+ powerpc-mkvmlinuz-support.patch
+ powerpc-serial.patch
#+ qla2xxx-removed.patch
+ remove-references-to-removed-drivers.patch
+ sparc64-hme-lockup.patch
+ tty-locking-fixes9.patch
+ version.patch
#+ powerpc-mv643xx-hotplug-support.patch
#+ powerpc-apus.patch
#+ s390-uaccess-const.patch
+ powerpc-build-links.patch
#+ alpha-compile-fix.patch
#+ powerpc64-audit_sysctl-build.patch
#+ net-ipconntrack-nat-fix.patch
#+ net-nf_queue-oops.patch
+ m68k-bvme.patch
+ m68k-mvme147.patch
+ m68k-mvme16x.patch
+ m68k-spinlock.patch
+ sparc64-atyfb-xl-gr.patch
#- alpha-compile-fix.patch

27
debian/patches-debian/series/2.6.14-1 vendored
View File

@ -1,27 +0,0 @@
+ amd64-int3-fix.patch
#+ drivers-scsi-megaraid_splitup.patch
+ fbdev-radeon-noaccel.patch
+ fs-asfs-2.patch
+ ia64-irq-affinity-upfix.patch
#- m68k-42_dma.patch
#- m68k-sonic.patch
#+ m68k-arch.patch
#+ m68k-drivers.patch
#+ m68k-kernel.patch
#+ m68k-include-m68k.patch
+ modular-ide.patch
+ modular-ide-pnp.patch
+ powerpc-calibrate-tau.patch
+ powerpc-g3-750cxe.patch
#+ powerpc-g4-l2-flush-errata.patch
+ powerpc-mkvmlinuz-support.patch
+ powerpc-serial.patch
+ qla2xxx-removed.patch
#+ remove-references-to-removed-drivers.patch
+ sparc64-hme-lockup.patch
+ tty-locking-fixes9.patch
+ version.patch
+ powerpc-mv643xx-hotplug-support.patch
+ powerpc-apus.patch
+ s390-uaccess-const.patch
+ powerpc-build-links.patch

2
debian/patches-debian/series/2.6.14-2 vendored
View File

@ -1,2 +0,0 @@
+ alpha-compile-fix.patch
+ powerpc64-audit_sysctl-build.patch

10
debian/patches-debian/series/2.6.14-3 vendored
View File

@ -1,10 +0,0 @@
+ net-ipconntrack-nat-fix.patch
+ net-nf_queue-oops.patch
+ m68k-bvme.patch
+ m68k-mvme147.patch
+ m68k-mvme16x.patch
+ m68k-spinlock.patch
+ 2.6.14.1.patch
+ sparc64-atyfb-xl-gr.patch
- alpha-compile-fix.patch
+ 2.6.14.2.patch