rpms/kernel/devel patch-2.6.15-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.313, 1.314 kernel-2.6.spec, 1.1826, 1.1827 sources, 1.255, 1.256 upstream, 1.238, 1.239 linux-2.6-cell-spidernet.patch, 1.1, NONE linux-2.6-scsi-megaraid-legacy.patch, 1.1, NONE linux-2.6-usbhid-wireless-security-lock.patch, 1.1, NONE

Fri Jan 6 09:08:16 UTC 2006

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18899

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	patch-2.6.15-git2.bz2.sign 
Removed Files:
	linux-2.6-cell-spidernet.patch 
	linux-2.6-scsi-megaraid-legacy.patch 
	linux-2.6-usbhid-wireless-security-lock.patch 
Log Message:
git2

--- NEW FILE patch-2.6.15-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBDvicSyGugalF9Dw4RAs3oAJ0Su0S7627J209DOuiTC8Do5zBg4gCfWYke
TvOB2ZCpFvnCpvU5LUwA2QQ=
=IZiQ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- .cvsignore	3 Jan 2006 10:57:13 -0000	1.313
+++ .cvsignore	6 Jan 2006 09:08:13 -0000	1.314
@@ -4,3 +4,4 @@
 linux-2.6.15.tar.bz2
 bcm43xx-20060103.tar.bz2
 ieee80211softmac-20060103.tar.bz2
+patch-2.6.15-git2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1826
retrieving revision 1.1827
diff -u -r1.1826 -r1.1827
--- kernel-2.6.spec	6 Jan 2006 08:08:13 -0000	1.1826
+++ kernel-2.6.spec	6 Jan 2006 09:08:14 -0000	1.1827
@@ -207,7 +207,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
-#Patch1: patch-2.6.16-git1.bz2
+Patch1: patch-2.6.15-git1.bz2
 #Patch2: patch-2.6.16-rc1-git1.bz2
 
 # Patches 100 through 500 are meant for architecture patches
@@ -235,7 +235,6 @@
 Patch308: linux-2.6-cell-idle-pmgt.patch
 Patch309: linux-2.6-cell-nvram-kmalloc.patch
 Patch310: linux-2.6-cell-spiderpic-no-devtree.patch
-Patch311: linux-2.6-cell-spidernet.patch
 Patch312: linux-2.6-cell-no-legacy-io.patch
 Patch313: linux-2.6-hvc-rtas-console.patch
 Patch314: linux-2.6-ppc-rtas-check.patch
@@ -320,8 +319,7 @@
 
 # SCSI bits.
 Patch1101: linux-2.6-scsi-advansys-enabler.patch
-Patch1102: linux-2.6-scsi-megaraid-legacy.patch
-Patch1103: linux-2.6-scsi-advansys-pcitable.patch
+Patch1102: linux-2.6-scsi-advansys-pcitable.patch
 
 # NFS bits.
 Patch1200: linux-2.6-NFSD-non-null-getxattr.patch
@@ -364,7 +362,6 @@
 Patch1790: linux-2.6-softcursor-persistent-alloc.patch
 Patch1800: linux-2.6-pwc-powerup-by-default.patch
 Patch1810: linux-2.6-smsc-ircc2-pnp.patch
-Patch1820: linux-2.6-usbhid-wireless-security-lock.patch
 Patch1830: linux-2.6-w1-hush-debug.patch
 Patch1840: linux-2.6-x86-hp-reboot.patch
 
@@ -603,7 +600,7 @@
 cd linux-%{kversion}
 
 # Update to latest upstream.
-#%patch1 -p1
+%patch1 -p1
 #%patch2 -p1
 
 #
@@ -666,8 +663,6 @@
 %patch309 -p1
 # Hardcode PIC addresses for Cell spiderpic
 %patch310 -p1
-# Cell spidernet fixes; mostly to use firmware from devicetree.
-%patch311 -p1
 # Cell has no legacy I/O
 %patch312 -p1
 # RTAS console support
@@ -799,10 +794,8 @@
 #
 # Enable Advansys driver
 %patch1101 -p1
-# Enable both new and old megaraid drivers.
-%patch1102 -p1
 # Add a pci table to advansys driver.
-%patch1103 -p1
+%patch1102 -p1
 
 #
 # Various upstream NFS/NFSD fixes.
@@ -862,7 +855,7 @@
 # Reduce stack usage in block layer
 %patch1740 -p1
 # Enable USB storage,UB & libusual magick.
-%patch1750 -p1
+#%patch1750 -p1
 # Enable SATA ATAPI by default.
 %patch1760 -p1
 # 
@@ -875,8 +868,6 @@
 %patch1800 -p1
 # PNP support for smsc-ircc2
 %patch1810 -p1
-# don't mistake security lock as a mouse
-%patch1820 -p1
 # Silence debug messages in w1
 %patch1830 -p1
 # Reboot through BIOS on HP laptops.
@@ -1419,6 +1410,7 @@
 
 %changelog
 * Fri Jan  6 2006 Dave Jones <davej at redhat.com>
+- 2.6.15-git2
 - Add timer quirk for ATI chipsets.
 - Reboot through BIOS on HP laptops.
 - Additional check in x86 edid parser.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- sources	3 Jan 2006 10:57:13 -0000	1.255
+++ sources	6 Jan 2006 09:08:14 -0000	1.256
@@ -1,3 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 96083b51cd30e60b86127113abed37a3  bcm43xx-20060103.tar.bz2
 1eb2bb778090c59fbeba6278d63a9309  ieee80211softmac-20060103.tar.bz2
+0eee153ab442496ead0581d00e83a1ca  patch-2.6.15-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- upstream	3 Jan 2006 05:47:14 -0000	1.238
+++ upstream	6 Jan 2006 09:08:14 -0000	1.239
@@ -1 +1,3 @@
 linux-2.6.15.tar.bz2
+patch-2.6.15-git2.bz2
+


--- linux-2.6-cell-spidernet.patch DELETED ---


--- linux-2.6-scsi-megaraid-legacy.patch DELETED ---


--- linux-2.6-usbhid-wireless-security-lock.patch DELETED ---


