rpms/kernel/devel kernel-2.6.spec, 1.2490, 1.2491 linux-2.6-scsi-advansys-pcitable.patch, 1.2, 1.3 linux-2.6-x86-hp-reboot.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Aug 1 17:48:24 UTC 2006
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15137
Modified Files:
kernel-2.6.spec linux-2.6-scsi-advansys-pcitable.patch
Removed Files:
linux-2.6-x86-hp-reboot.patch
Log Message:
drop unneeded patch (already upstreamed)
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2490
retrieving revision 1.2491
diff -u -r1.2490 -r1.2491
--- kernel-2.6.spec 1 Aug 2006 17:25:06 -0000 1.2490
+++ kernel-2.6.spec 1 Aug 2006 17:48:21 -0000 1.2491
@@ -278,7 +278,6 @@
Patch202: linux-2.6-intel-cache-build.patch
Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch
Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch
-Patch206: linux-2.6-x86-hp-reboot.patch
Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch
Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch
Patch209: linux-2.6-x86_64-opterons-synchronize-p-state-using-TSC.patch
@@ -747,8 +746,6 @@
%patch203 -p1
# Workaround BIOSes that don't list CPU0
%patch205 -p1
-# Reboot through BIOS on HP systems,.
-%patch206 -p1
# Support TIF_RESTORE_SIGMASK on x86_64
%patch207 -p1
# Add ppoll and pselect syscalls
linux-2.6-scsi-advansys-pcitable.patch:
drivers/scsi/advansys.c | 82 ++++++++++++++--------------
linux-2.6.17.noarch/drivers/scsi/advansys.c | 8 ++
2 files changed, 49 insertions(+), 41 deletions(-)
Index: linux-2.6-scsi-advansys-pcitable.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-scsi-advansys-pcitable.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-scsi-advansys-pcitable.patch 31 Oct 2005 03:03:28 -0000 1.2
+++ linux-2.6-scsi-advansys-pcitable.patch 1 Aug 2006 17:48:21 -0000 1.3
@@ -1,21 +1,6 @@
-Remove a lot of duplicate #defines from the advansys driver.
+Remove a lot of duplicate #defines from the advansys driver,
+and make them look like PCI IDs as defined elsewhere in the kernel.
---- linux-2.6.14/include/linux/pci_ids.h~ 2005-10-30 21:36:21.000000000 -0500
-+++ linux-2.6.14/include/linux/pci_ids.h 2005-10-30 21:37:16.000000000 -0500
-@@ -949,6 +949,13 @@
- #define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006
- #define PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO 0x8016
-
-+#define PCI_VENDOR_ID_ASP 0x10cd
-+#define PCI_DEVICE_ID_ASP_1200A 0x1100
-+#define PCI_DEVICE_ID_ASP_ABP940 0x1200
-+#define PCI_DEVICE_ID_ASP_ABP940U 0x1300
-+#define PCI_DEVICE_ID_ASP_ABP940UW 0x2300
-+#define PCI_DEVICE_ID_38C0800_REV1 0x2500
-+#define PCI_DEVICE_ID_38C1600_REV1 0x2700
-
- #define PCI_VENDOR_ID_TCONRAD 0x10da
- #define PCI_DEVICE_ID_TCONRAD_TOKENRING 0x0508
--- vanilla/drivers/scsi/advansys.c 2005-06-17 15:48:29.000000000 -0400
+++ linux-2.6.12/drivers/scsi/advansys.c 2005-07-05 23:27:48.000000000 -0400
@@ -889,10 +889,6 @@ typedef unsigned char uchar;
@@ -184,6 +169,24 @@
0, /* 62 reserved */
+--- linux-2.6.17.noarch/drivers/scsi/advansys.c~ 2006-08-01 13:33:56.000000000 -0400
++++ linux-2.6.17.noarch/drivers/scsi/advansys.c 2006-08-01 13:34:58.000000000 -0400
+@@ -895,6 +895,14 @@ typedef unsigned char uchar;
+ #define ASC_DVCLIB_CALL_FAILED (0)
+ #define ASC_DVCLIB_CALL_ERROR (-1)
+
++#define PCI_VENDOR_ID_ASP 0x10cd
++#define PCI_DEVICE_ID_ASP_1200A 0x1100
++#define PCI_DEVICE_ID_ASP_ABP940 0x1200
++#define PCI_DEVICE_ID_ASP_ABP940U 0x1300
++#define PCI_DEVICE_ID_ASP_ABP940UW 0x2300
++#define PCI_DEVICE_ID_38C0800_REV1 0x2500
++#define PCI_DEVICE_ID_38C1600_REV1 0x2700
++
+ /*
+ * Enable CC_VERY_LONG_SG_LIST to support up to 64K element SG lists.
+ * The SRB structure will have to be changed and the ASC_SRB2SCSIQ()
+
The advansys driver needs a lot of TLC. It does all its probing
--- linux-2.6-x86-hp-reboot.patch DELETED ---
More information about the fedora-cvs-commits
mailing list